merge history back in
Merge branch 'hb2' of https://github.com/scttcper/honbot-django into hb2