this is a mess
how bout now?
Merge branch 'master' of https://github.com/HappyPenguin/DTI_PROCESSING

Conflicts:
	calculate_connectivity_matrix.py
Merge branch 'master' of https://github.com/HappyPenguin/DTI_PROCESSING

Conflicts:
	calculate_connectivity_matrix.py