Better aggregation support

Added support and tests for aggregation operations.
If we bumped to > 2.11.1 this wouldn't be needed.  We'll take a look before we merge this PR.