[004-bugfixs] Bug fixs to the 0.0.4 release
Merge pull request #77 from sniperd/004-bugfixs

004 bugfixs
Merge pull request #78 from sensu/development

Merging into master for 0.0.5 -- bug fixs release