Another attempt at cleaning up travis