OS X instructions (mostly), conform to avatar standard, and a bugfix

See commit notes
Fixes #318 (mostly)
Needs testing, I remember that this was needed.