More travis cleanups