Sorry about that, spelling ._.
Merge branch 'master' into python3.4

Conflicts:
	core/bot.py
	core/irc.py