merging
making examples pass
removed kwic2 and collocate and features (retained in dev)