Some preliminary changes before merging in the newest version of dedupe
Changed the blocking / clustering logic in the dedupe script to comply with the new dedupe logic