Some cleanup of travis.yml