Merge pull request #2332 from reaperhulk/upgrade-osx-builders

upgrade os x travis jobs to use latest image