sensu/sensu-docs — pull request #53 by calebhailey (2013-11-17 00:19:15+00:00)
Title: Fix for an errant merge resolution in my last PR

fixing errant merge resolution in which I attempted to manually apply these changes:

* https://github.com/sensu/sensu-docs/commit/d2389ffa810a5eb163cbdf85ddb0dde26d32b73a
* https://github.com/sensu/sensu-docs/commit/c2d1582e5fdc680e3c0d49537502f4a893459635
* https://github.com/sensu/sensu-docs/commit/e0a3e20ac8f551f4e2e5e67afd78b434067d37ed