ENH: using conf files to specify pipeline
renaming
new tests
fixed mergeconflict