Update database.py for merge with upstream
Merge branch 'master' of https://github.com/markbahnman/NotVeryCleverBot
Update .gitignore and config.py for project specific configurations