Reorganized .travis.yml