Improve travis-ci build matrix