Merge branch 'python3.4' into protocol-fuckery-merge

Conflicts:
	cloudbot/__init__.py
	cloudbot/core/connection.py
	cloudbot/core/events.py
	plugins/dice.py
	plugins/fishbans.py
	plugins/plpaste.py