Rearranging Travis CI config file