rearranges travis.yml yet again