Green OS X Build

WIP. Please do not merge until this pull request build is green on Travis.