Merge branch 'dev_branch' into 'master'

Removed temp stuff from setup.py, cleaning of sparse coding algorithms

See merge request !17