Improve travis matrix