Merge pull request #1575 from joshf/master

Update build scripts on OS X