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
Merge remote-tracking branch 'upstream/master' into camino
Add header option for camino.dti.DTMetric
Merge pull request #2 from nipy/master

Update nipype fork.
Fixed the " AttributeError: 'Refit' object has no attribute 'outputs' " error.
Updated file.
Added 'in_file_c' to the CalcInputSpec for secondary operand files.
Merge branch 'master' of https://github.com/nipy/nipype into nipy-master

Conflicts:
	nipype/interfaces/afni/preprocess.py
Removed some temporary changes for testing.
Merge remote-tracking branch 'upstream/master' into camino
Merge remote-tracking branch 'origin/camino' into camino
Camino update