minor changes
Merge branch 'enh/restingwf' of git://github.com/satra/nipype into enh/restingwf

Conflicts:
	examples/rsfmri_preprocessing.py
Merge branch 'enh/restingwf' of git://github.com/satra/nipype into enh/restingwf
Merge branch 'enh/restingwf' of git://github.com/satra/nipype into enh/restingwf

Conflicts:
	examples/rsfmri_preprocessing.py
Merge branch 'enh/restingwf' of git://github.com/satra/nipype into enh/restingwf

Conflicts:
	examples/rsfmri_preprocessing.py
added field map parse args to satra's most recent version
minor changes
readded engine.py ... my bad
minor changes
fixed tab spacing issue
fixed more tabbing issues
tabbing issues
revenge of the tab issues
tab issues
tab issues
tab...
tab
tab
tab
tab issue