Changed the config_file input under FNIRT Inputspec to take in a String instead of an Enum type. This way a custom FSL FNIRT config file can be used.
Merge branch 'master' of https://github.com/nipy/nipype into nipy-master

Conflicts:
	nipype/interfaces/fsl/preprocess.py
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
AFNI issue
Merge remote-tracking branch 'upstream/master'
AFNI fixed by latest master
New interface for Camino dtshape. Minor correction to Camino ComputeEigensystem
Correct PEP8
3DROIstats fix
fixed tests
added missing test
wrong path
fixed list outputs
Fixed template for -o argument of fsl_glm
Removed the extension
Updated google tracking.
Added link tracking.
Merge remote-tracking branch 'upstream/master' into camino
fix: changed iri to current standard