Non-active accounts activated on email change confirmation

Previously, when a newly registered user mistyped their password, they would be left unable to activate their account because even after changing their email address to the correct one, they had no way of reaching the account activation email that was sent to the incorrect address. Users would have to contact course ops to have their accounts activated.
To remedy this, account activation and the confirmation of a new email address has been combined for non-active account. The text displayed on the dashboard for newly registered but non-active accounts has also been changed to be less misleading, and to encourage users to check their email addresses and correct them if necessary.
![email-and-account-confirmation-msg](https://cloud.githubusercontent.com/assets/4758600/3650481/abd314f4-111c-11e4-8046-3156a78c78d6.png)

![screen shot 2014-07-22 at 10 23 58 am](https://cloud.githubusercontent.com/assets/4758600/3661895/004d420e-11c5-11e4-9db6-923230a7133d.png)



Can you put this whole sentence onto its own line, instead of adding "The user account" to the previous line? This way, only your change shows up in the diff and it preserves the blame history.

I used to never care about diffs/blame, until I realized how useful `git blame` can be. Imagine I'm trying to make sense of this comment months from now, "We confirm with the old e-mail, and update." As is, `git blame` will tell me you were the author. So I ping you, maybe wait a couple of days to get a response, only to hear "Oh, I didn't even write that; it was already there." So now I checkout an older copy, blame the line, go through the whole process again, and end up getting the same response, "Oh, I didn't write that, I just deleted an extra space after the period." Obviously, we can't _always_ do this, but whenever we can create clean diffs, we should.