matrix-spec-proposals

Fix some obsolete uses of user_id key in events

#376

Merged