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
add mri_surf2vol wrap
added identity input to Surface2VolTransform
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
3DROIstats fix
fixed tests
added missing test
wrong path
fixed list outputs
Fixed template for -o argument of fsl_glm
Removed the extension
Merge https://github.com/stymy/nipype

Conflicts:
	nipype/interfaces/afni/preprocess.py
fixed pull request issues:
wrapping Surface2VolTransform,
-moved from preprocess.py to utils.py
-improved input descriptions
-renamed output suffix
fixed errors from DOCTEST, now OK.
Merge pull request #2 from nipy/master

Update nipype fork.