(email-aggregation) follow-up

* Spliced off the bucketing logic into it's own module
* Not parsing the activityStreamId