Fixes
Merged 'bleeding'

Conflicts:
	bot.py
	utils/command.py