More many changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot.py
	core/wikidotcache.py
	plugins/author.py
	plugins/scp.py
	plugins/sea.py
	plugins/tale.py

Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot.py
	core/wikidotcache.py
	plugins/author.py
	plugins/scp.py
	plugins/sea.py
	plugins/tale.py