Bring .travis.yml in line with Hilary .travis.yml

I'll be debugging travis in this PR.