[Commotion-admin] [commotion-docs] Update master from staging - multiple changes (#227)

[Andy Gunn]

@critzo @natmey - If no one else has questions or concerns, can we merge this into master today? Thanks!

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/commotion-docs/pull/227#issuecomment-53270150
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20140825/5557fab5/attachment.html>