Improve Travis matrix