Merge github.com:modilabs/bamboo into calc-names-385
store aggregation id with aggregate calculations, closes #363
Merge branch 'master' of github.com:modilabs/bamboo into agg-ds-ids-363
handle none group
handle not aggreagtion
Merge pull request #402 from modilabs/agg-ds-ids-363

Agg ds ids 363