One off settings that shouldn't change
Merge branch 'master' of https://github.com/bytedreamer/BusyBot

Conflicts:
	BusyBot/settings.py
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Merge branch 'master' of https://github.com/bytedreamer/BusyBot
Fix threading issues with initial loading of driver