Make our usage of 'e-mail' consistent.
Review Request #5887 — Created May 27, 2014 and submitted — Latest diff uploaded
In most places, we use the string 'e-mail' for user-visible text. There were a few places where we had 'email'. This cleans them up.