fix and organize travis.yml