Fix tells.
Fix two reminders being sent when joining a room
Add /customavatar
Merge branch 'kupo-base' into kupo
Merge remote-tracking branch 'upstream/master'

Conflicts:
	app.js
	config/commands.js
	rooms.js