[Commotion-admin] [mlab-observatory] Final merge for 1.0 (#27)

[critzo]

Merged #27.

---
Reply to this email directly or view it on GitHub:
https://github.com/opentechinstitute/mlab-observatory/pull/27#event-197013701
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.chambana.net/pipermail/commotion-admin/attachments/20141121/4fb80427/attachment-0001.html>