Fix duplicate and misnamed monitoring templates.
Merge pull request #87 from zenoss/feature/analytics_bundle

Fix duplicate and misnamed monitoring templates.