Added user option in genRegKeys.  The concern here is that some users still require merging, so I don't wanna do it for every user yet.