Merge branch 'no-discordapp' of https://github.com/auscompgeek/matrix-appservice-discord into develop