cleaning data & working directories
Merge branch 'master' of https://github.com/stymy/pipelines

Conflicts:
	src/clustering/clustering/__init__.py~
	src/clustering/clustering/cluster.py~
	src/clustering/clustering/mask_surface.py~
	src/clustering/clustering/mask_volume.py~
	src/clustering/clustering/utils.py~