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