Rewriting of collectors. Better interoperability between collapsing,
join, distance and scoring.
Fix with distance collector
Merge pull request #373 from emmanuel-keller/1.5

Rewriting of collectors