removed deprecated input
Merge branch 'master' of https://github.com/nipy/nipype.git