Trivial .travis.yml reorganization