Commenting out OS X fixes for now.

This breaks the build on travis, so I'll need to wait until I can use an
Ubuntu machine to check this out further. Relevant to issue #81.