Merge branch 'master' into python3

Conflicts:
	botmpd/libmpd/BotMPD.py
	nextprev/core.py
Several python3 fixes + cleanup
Merge branch 'python3' of https://github.com/pipoteam/pipobot-modules into python3

Conflicts:
	blague/blague.py
	botmpd/libmpd/BotMPD.py
	nextprev/core.py