Update activation email text

Make it more active.  Adds a separate section for edX.org-specific copy,
because it's hard to make it generic.


Indent these lines under the `% else if` - see the above and below `if` and `else` statements for consistency