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 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.
tst: enable py26 testing
fix: conda install
fix: conda install without prompt
fix: add nose to requirements
Merge pull request #732 from satra/tst/travispy26

add 2.6 testing to travis
add new tutorial to doc.
Update COMMIT_INFO.txt
Auto generated the test for the updated interface.
Delete COMMIT_INFO.txt
Merge pull request #4 from nipy/master

Update fork.
Create COMMIT_INFO.txt
Merge pull request #733 from sgiavasis/master

Added 'in_file_c' to the CalcInputSpec of afni/preprocess for secondary operand files.