More work on concordance and KWIC objects
Merge pull request #268 from clovis/master

More work on concordance and KWIC objects