For Travis CI - reshuffle build matrix to optimise build jobs.
For Travis CI - switch CI build to use OS X build environment.