Add more consistency to fallback mode
Merge branch 'master' of https://github.com/nmelnick/whatbot