Resolving review comments
Merge branch 'collector-event-filter' of https://github.com/ning/collector into collector-event-filter