add mri_surf2vol wrap
added identity input to Surface2VolTransform
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.
add: pycharm .idea/ directory to .gitignore
fix: typo in fugue parameter
fix: warp/unwarp arg parsing for use w/o an in_file
tst: auto test generation for FUGUE
Introduced a wrapper for 3dTcorr1D.
Merge pull request #5 from nipy/master

Update nipype fork.
Made revisions to the new 3dTCorr1D interface.
Merge branch 'master' of https://github.com/sgiavasis/nipype
FIX: topup out file and params
Merge pull request #729 from nicholsn/fix/fugue-typo

WIP: FSL FUGUE Bug Fix and Cleanup
Fixed file extension
Merge branch 'master' of https://github.com/nipy/nipype.git
Merge branch 'master' into tst/martin

* master:
  Fixed file extension
  Fixed test files import.
  fixed possible values for -datatype parameter of tracks2prob interface. Previous values were in error. correct values obtained from: http://www.brain.org.au/software/mrtrix/general/formats.html#datatypes
  autogenerated tests
  added dummy files for testing new mrtrix interfaces
  updated CHANGES log
  Updated new mrtrix interfaces to new out_file format
  Added GenerateDirections, FindShPeaks, Directions2Amplitude interfaces wrapping gendir, find_SH_peaks and dir2amp mrtrix commands.
  tst: auto test generation for FUGUE
  fix: warp/unwarp arg parsing for use w/o an in_file
  fix: typo in fugue parameter
  add: pycharm .idea/ directory to .gitignore
fix: fixed autotest for applytopup
Merge pull request #1 from satra/tst/martin

Tst/martin