Tons and tons of changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bot.py
	cache.cache
	config
	identity.ini
	plugins/alexandra.py
	plugins/scp.py
	plugins/sea.py
	plugins/tag.py
	plugins/tale.py