Merge pull request #5 from zenoss/develop

release dev to master
Merge pull request #11 from zenoss/develop

merge
Merge pull request #14 from zenoss/develop

merge
Merge pull request #16 from zenoss/master

Master