mod. refactor aggregators to reflect new data definition. Add new aggs 'proportion' and 'stats'.

Change-Id: Ida92de7a5bc735d5484e66753d6fca6441a8881e