Merge pull request #236 from clovis/master

Fix another bug in navigation
Merge pull request #19 from ARTFL-Project/master

merge downstream
debugging query for perseus
Merge branch 'master' of github.com:rwhaling/PhiloLogic4
fixed whitespace-egrep problems for unicode
fixed closing egrep input twice
added debug hooks to query
Merge pull request #237 from rwhaling/master

merge upstream query fixes
returning proc from expand_query
Merge pull request #238 from rwhaling/master

returning proc from expand_query
Merge pull request #45 from ARTFL-Project/master

Update downstream