abstraction towards #325
typo fix
split parse to for agg and for calc, turns out aggregations are special, closes #325
fix test
Merge pull request #452 from modilabs/aggs-325

Aggs 325
Merge branch 'master' of github.com:modilabs/bamboo into version