Add aggregations
Merge pull request #550 from jlinn/aggregations

Add aggregations