Cleaning up travis ci config a bit