Rearranged Travis.yml in a way that makes more sense