Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.CalculatedPerformance
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.CalculatedPerformance into develop
Merge branch 'develop' of https://github.com/zenoss/ZenPacks.zenoss.CalculatedPerformance into develop
Refactoring code to fix tests.
Merge pull request #34 from zenoss/feature/FixUnitTests

Feature/fix unit tests