initial fix working for python3
finished coding, now need to fix unit tests
fixed subpipeline by making it a class, not a function, and passing in the object to the class
fixed unit tests (removed most of test_direct_proxy because it doesn't make sense
convert to use only one decorator
Get python3 changes to work in python2
remove commented out line
Merge branch 'master' into python2and3
Add back travis
Add 3.4 support in travise