Commiting and pushing because I'm leaving for the weekend and
can't SSH into my laptop.
Reactionmenu is working but thoroughly untested
Merge branch 'master' into reactionmenu

Conflicts:
	myuser.py
Messy merging