Change all references to email to use the userid instead.  Needs more testing but seems to work (email2id)
This is good, but remember to fix voting next (email2id)
And finishing touches!  Back slapping all around (email2id)
Merge branch 'email2id'