Updating CinderBlocks docs to reflect os='macosx'
Merge branch 'master' of github.com:cinder/Cinder