Minor fixes, still needed some further tests
Merge branch 'master' into enh/AddCSVRow

Conflicts:
	CHANGES
	nipype/algorithms/misc.py

Merge after updating master to upstream
Merge branch 'master' into enh/GraftWorkflow
Forbid dots in InterfacedWorkflow connections
Merge branch 'enh/GraftWorkflow' into experimental
Merge branch 'master' into enh/AddCSVRow

Conflicts:
	CHANGES
Merge branch 'enh/AddCSVRow' into experimental

Conflicts:
	CHANGES
	nipype/algorithms/misc.py