applied pep8 fixes
Merge branch 'fix/Similarity4DOutput' into experimental

Conflicts:
	nipype/interfaces/nipy/utils.py