leftover changes from yesterday (gitignore db and core option changes)
Merge branch 'master' of github.com:Wordseer/wordseer_flask
Merge branch 'master' of github.com:Wordseer/wordseer_flask into consolidated-models
Commented profiling code so that unit tests pass.