Merge remote-tracking branch 'origin/master'
oops, need __init__.py in bots folder to import!
Merge remote-tracking branch 'origin/master'