removing dead code, tweaking downsampling
Merge branch 'feature/query-service-use-jackson' of github.com:zenoss/query into feature/query-service-use-jackson