Adding metric aggregation

Sidekicks: @nathanhumbert & @christynicol 

It may be easier for a couple files to use the ?w=1 url param to ignore the whitespace changes.