updates from multi-column aggregations
cleanup and extend calc group agg update tests
Merge pull request #472 from modilabs/aggs-470

Aggs 470