dir fixes
Merge branch 'master' of https://github.com/TobbenTM/SSVD

Conflicts:
	bin/setup.py