Correct passing of Grouping/Without to `count_values`
Correct passing of Grouping/Without to `count_values`

Previously `count_values` was dropping all Grouping labels in its
aggregation.

Fixes #283

jacksontj/promxy,jacksontj/promxy