Don't mention edge in the subject line; use same message for edx and edge.
Merge pull request #265 from edx/christina/activation-email

Don't mention edge in the subject line; use same message for edx and edg...