Backport aggregator stuff to 0.8
Merge pull request #368 from twitter/0.8-agg-backport

Backport aggregator stuff to 0.8