Unify email terminoligy

According to https://en.wikipedia.org/wiki/Email#Terminology email is the most common and recommended form.

I guess the mix comes from the French who are using e-mail but we should probably use courriel.