profile - ensure that email appears in form, tests

Any email from the User model should appear in the combined
profile/user form and propogate back on save
Merge branch 'master' into integration