Improve travis test matrix