Use SyncMyPixPrefs directly
Remove NameMatcherOptions, switch diminutivesFile to be a separate
argument (for the time being), and use SyncMyPixPrefs directly (there
were too many layers of indirection at this point).