Merge pull request #173 from matfed/master

Heuristic filter and MapReduce-based sorting
Merge pull request #174 from matfed/master

making use of generic mergeWithScoobi
api switching