update headers and tests for aggregations.
Merge branch 'master' of github.com:dreamtools/dreamtools