Merge pull request #288 from MITx/dormsbee/hack_fix_pwd_reset

Bad hardcoded hack fix to password reset.

lms/templates/registration/password_reset_email.html

 {% load i18n %}{% load url from future %}{% autoescape off %}
-{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
+{% blocktrans %}You're receiving this e-mail because you requested a password reset for your user account at edx.org.{% endblocktrans %}
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{{ protocol }}://{{ site_name }}{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
+https://www.edx.org{% url 'django.contrib.auth.views.password_reset_confirm' uidb36=uid token=token %}
 {% endblock %}
 {% trans "Your username, in case you've forgotten:" %} {{ user.username }}
 
 {% trans "Thanks for using our site!" %}
 
-{% blocktrans %}The MITx team{% endblocktrans %}
+{% blocktrans %}The edX Team{% endblocktrans %}
 
 {% endautoescape %}