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
Updated google tracking.
Added link tracking.
Merge remote-tracking branch 'upstream/master' into camino
fix: changed iri to current standard
Merge pull request #715 from satra/fix/iri

fix: changed iri to current standard
Add header option for camino.dti.DTMetric
fix: cleaned prov
Merge pull request #716 from satra/cleanup/prov

fix: cleaned prov
fix: allow 4 parameters for antsRegistration transform
doc: added reference to BSplineSyn
Merge pull request #717 from satra/fix/antsbspline

Fix/antsbspline