Make our usage of 'e-mail' consistent.

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.

Reviewed at https://reviews.reviewboard.org/r/5887/