updates from my mod, fix nick collisions, improve history
history includes the message you are currently typing again
Merge branch 'master' of git://github.com/cracker64/tptmp

Conflicts:
	client.lua