enh: appropriate xor for threshold and white matter parameters
enh: adding initial version of resting workflow
try to determine output dir from fsf file, to deal with cases where the output dir is not in the cwd
enh: completed upto compcorr correction
updated changes
Merge pull request #23 from cdla/enh/restingwf

updated changes!
fix: parameters, node types
changes filter1 form fsl.FilterRegressor to fsl.GLM
enh: use voxel dimension were erosion and smoothing, pep8 cleanup
changes filter1 form fsl.FilterRegressor to fsl.GLM
added dewarp and datasink format
Merge branch 'enh/restingwf' of https://github.com/cdla/nipype into enh/restingwf

Conflicts:
	examples/rsfmri_preprocessing.py
Merge pull request #24 from cdla/enh/restingwf

Enh/restingwf
fix: glm fixes and pep8 cleanup
fix: force demean and ensure sigma calculation returns float
fix: cleaned up datasink organization
removed save_warped flag from FUGUE call since it doesn't seem to exist in the FUGUE interface
enh: some parcellation time series
Merge branch 'fix/mapnode' into enh/restingwf

* fix/mapnode:
  fix: added forced removal and running of multiple hashfiles
  fix: remove json files when rerunning a mapnode
  Add test for SelectFiles force_lists error
  Check that force_lists fields have templates
  Enhance flexibiliy of SelectFiles output list coercion
  without this, line 151 tries to call a module
fix: cleaned prov encoding to store dictionaries and lists as prov json