fix collocation, and other things
bug fixes to collocation
bug fixes to collocation
fix collocations in sidebar, and initial support for selecting filtering in collocations
Merge pull request #286 from clovis/master

Fixes to collocations, and initial support for filtering options in collocations