Cleaned up travis matrix