fixing bugs
Merge branch 'rewrite' of github.com:AlwaysTraining/bbot into rewrite
added back accidental delete
Merge branch 'rewrite'