Improve the travis matrix