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'
fix: doctest + white spaces
Merge pull request #692 from satra/fix/fsdoctest

fix: doctest + white spaces
Fixed permissions and some tests.
begin aFNI refactor
further cleanup
All tests pass
Further cleanup
changelog
Fixed boolean expression
enh: update FILMGLS to support FSL release 5.0.5
Added support for custom output names
name_source for lists
output_name example
AFNI issue