Reorganize travis.yml