removing changes
setup tools upgrade after activate
Merge pull request #483 from ENCODE-DCC/travis_fix

Travis fix
Merge remote-tracking branch 'origin/master' into 1647-paired-end-fix