Cleanup .travis.yml
Merge pull request #2919 from tricknotes/cleanup-travis-yml

Cleanup .travis.yml