BUGFIX: fixed broken nipy_labs (installation of)
NEWFILE: pypreprocess/external/nipy_labs/libcstat (need by routine.c)
REFACTOR: merged spm_multimodal_fmri.py and nipype_preproc_spm_multimodal_faces.py
DELETED: junk conf files
Merge branch 'master' of https://github.com/neurospin/pypreprocess