tiny fixups
fixed mergeconflict
Merge is148601:~/CODE/FORKED/pypreprocess
BUGFIX: fixed broken module
NEW FEATURE: script for preprocessing connectome-db data set
Merge branch 'master' of https://github.com/dohmatob/pypreprocess
QA post-STC
code cleanup + more testcases
RF: single subject pipeline API
RF: single subject pipeline API
mergconflict fix
ENH: removed dead code from loaduint8(...) function
code cleanup
?
MERGECONFLICT: fixed
REFACTORR
FIX: broken support for core epi -> anat
MERGECONFLICT: fixed
REFACTORR
MERGECONFLICT: fixed