Refactor multi-traveler merging so we use it for calendar events too

Now creating an event for a multi-traveler trip will no longer create one
event per traveler.