Simplification of travis.yml