Another attempt at a clean Travis CI build