This is a PR for testing Travis CI and getting that going again.

Don't merge this yet. Once I've massaged things to get Travis CI on OSX going again then I'll post a message and probably merge it.