Merge with head

activation_active.html

+
+<%inherit file="main.html" />
+
+<section class="activation">
+  <h1>Account already active!</h1>
+  <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
+  <p> This account has already been activated. We will notify you as
+  soon as the course starts.</p>
+</section>

activation_invalid.html

@@ -2,6 +2,8 @@
 <section class="activation">
 <h1>Activation Invalid</h1>
 
-<p>Something went wrong. Did you already activate the account? Otherwise, e-mail us to
-  let us know what happened at <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a>.</p>
+<p>Something went wrong. Check to make sure the URL you went to was
+  correct -- e-mail programs will sometimes split it into two
+  lines. If you still have issues, e-mail us to let us know what happened
+  at <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a>.</p>
 </section>