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'
begin aFNI refactor
further cleanup
All tests pass
Further cleanup
changelog
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
Merge remote-tracking branch 'upstream/master'
AFNI fixed by latest master
enh: allow a single mask for fixed image
fix: allow contrast file to be an input and therefore hashed when content changes
enh: allow a depth first topological sort. in this scenario each isolated subgraph gets a topological sort ordering.
enh: allow hashing of parameterization to be controlled using a configuration option.