Merge branch 'testing' into lilybot

Conflicts:
	plugins/Seen/plugin.py