Merge pull request #433 from pabuhler/osx-ci-update

osx ci update