Making aggregation optional during Donut->Eclair contact import.

The importer will create contacts just like the aggregator would,
but without actually aggregating duplicates. All raw contacts
are still marked for reaggregation, so the dupes are still discovered
in the subsequent aggregation pass.

The user experience is that all contacts show up very quickly (on sholes
we should expect to see 700 contacts within 15-17 seconds). Then a bit
later duplicates start disappearing.
7 files changed