Reintroduce user_id into events
Merge pull request #14 from dragonfi/reintroduce-user-id

Reintroduce user_id into events