Issue #37 Change from email addresses to user ids

First cut of changing from email addresses to user ids.