Add OSX support, and update the README
Merge branch 'update-for-osx'