Uncleanup the travis build matrix