Merge remote-tracking branch 'origin/db' into db

# Conflicts:
#	roxbot.py
#	roxbot/cogs/admin.py
#	roxbot/db.py