Merge pull request #7 from zenoss/develop

merge to master