WIP...
fixed some PEP8 errors
WIP
Merge branch 'enh/GraftWorkflow' into experimental

Conflicts:
	nipype/pipeline/engine.py
Finished merge
Merge branch 'enh/GraftWorkflow' into experimental