Add shotas and traps
Major additions
Fixed config.default
Process only one regex match
Merge branch 'master' of https://github.com/infinitylabs/uguubot

Conflicts:
	plugins/attacks.py
	plugins/core_admin_channel.py
	plugins/core_admin_global.py
	plugins/core_settings_user.py
	plugins/util/database.py
Fix up cleverbot implementation

I guess at least it works now?