Merge pull request #1 from buttercoin/btimm-admin

Brian's adjustments to the email field in the user collection