Merge branch 'hs/roomstore-db' of github.com:Half-Shot/matrix-appservice-discord into hs/roomstore-db