Merge pull request #2630 from reaperhulk/travis-update-osx

update osx_image values based on travis supported versions