More travis config cleanup