Put travis.yml back to how it is in develop