v0.15.201403031 build for OS X

Here are the changes I needed to get v0.15.201403031 working on OS X.