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

See commit notes
Fixes #318 (mostly)
What is this trying to do 

Why not just save every avatar by ID?