Added admin functionality
Merge remote-tracking branch 'upstream/master'

Conflicts:
	lib/cinch/plugins/bot_adm.rb