Overall travis cleanups