Leak testing merge to folder
Fixed simple-measures aggregations and added tests to catch bugs
Changed aggregator to sane defaults
Removed log code that shouldn't be there