Fixes #1161 This change parallels what was done in #1257 1da3c00 to fix the FingerprintKeyer and moves the diacritic removal before the deduping. Includes a test.
1da3c00