Merge pull request #90 from clovis/master

update upstream
added a debug statement for Query.py
Merge pull request #10 from ARTFL-Project/master

merge downstream
bugfixes in coocurrence search
Merge pull request #91 from rwhaling/master

cooccurrence search bug fix, experimental
Merge pull request #92 from clovis/master

Update upstream
Merge pull request #14 from ARTFL-Project/master

Update downstream