Fix subpipeline and related tests
Add travis support
remove commented out line
Merge branch 'master' into python2and3
Add back travis
Add 3.4 support in travise