Commented 'performance breaker'...doesn't actually work.
Merge branch 'master' of https://github.com/akappel/bot_sandbox.git