Bump underscore to 1.7.0
Refactored UI activity aggregator

Attempt at simplifying the activity aggregator. Tests pending.