factored out grep_word from expand_query
cleared out relevance report and old word query code
Merge pull request #48 from rwhaling/master

Update downstream