Add event type to upcoming.json
event_type, not event-type
Check edition type
Merge pull request #68 from theodi/event-type-in-upcoming

Add event type to upcoming.json