Merge PDUs and Events into one object
Merge remote-tracking branch 'origin/develop' into merge_pdu_event_objects
Merge pull request #14 from matrix-org/merge_pdu_event_objects

Merge pdu and event objects