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

Travis fix