Update .travis.yml
Merge branch 'travis.macosx' into update.macosx