Add filtering back in, make sure it's tested
Add marketplace ID and name to all events
jshint
Merge pull request #591 from kleinsch/analytics-updates

Analytics updates