Cleaned up travis conf