finished fixing up merge
finished fixing up merge

pombredanne/dedupe,datamade/dedupe,nmiranda/dedupe,dedupeio/dedupe,nmiranda/dedupe,pombredanne/dedupe,datamade/dedupe,davidkunio/dedupe,01-/dedupe,tfmorris/dedupe,neozhangthe1/dedupe,dedupeio/dedupe,01-/dedupe,dedupeio/dedupe-examples,neozhangthe1/dedupe,davidkunio/dedupe,tfmorris/dedupe