Fixing what I broke during last checkin
Merge branch 'anyevent' of github.com:robisonjoel/whatbot into anyevent