bot bugfixes
Merge branch 'master' of https://github.com/nikisweeting/violent-python