Improve .travis.yml structure and order