Matrix discussion and updates to message packets
Merge branch 'master' of https://github.com/sshamilton/chatservice