Merge pull request #1273 from reaperhulk/fix-travis-osx

update travis.yml to fix os x builders