Update .travis.yml, fix imports and tests
Merge pull request #795 from adam111316/travis

Update .travis.yml, fix imports and tests
Merge remote-tracking branch 'echel0n/master' into ThePirateBay