Removed the email field from core User

And reverted everything that wasn't changed by anything but user compatibility stuff back to the version on the master repository.

Signed-off-by: ajthompson