Fixed most errors
Merge branch 'PlasmaSheep-master' of github.com:Wordseer/wordseer_flask into PlasmaSheep-master
Fixed mysterious unit test bug