Cleaned up .travis.yml a bit