Cleaned up travis build matrix