Cleaned up the Travis config a bit