Don't mention edge in the e-mail; same text used for edge and edx.
Merge pull request #229 from edx/christina/activation_email

Don't mention edge in the e-mail; same text used for edge and edx.