Tidied up event models (fixed event names and table refs) and joined events to primary events view
Merge branch 'feature/0.9.2' of github.com:snowplow/snowplow into feature/0.9.2