Update Mac OS X instructions

Fixes #671, #898.