Fixed e-mail in URLs.py, fixed 2 gjs bugs

courseware/capa/capa_problem.py

@@ -133,7 +133,7 @@ class LoncapaProblem(object):
         for entry in problems_simple.xpath("//"+"|//".join(response_properties+entry_types)):
             answer = entry.get('correct_answer')
             if answer != None:
-                answer_map[entry.get('id')] = contextualize_text(answer, self.context())
+                answer_map[entry.get('id')] = contextualize_text(answer, self.context)
 
         return answer_map
 

courseware/capa/responsetypes.py

@@ -8,7 +8,9 @@ from django.conf import settings
 global_context={'random':random,
                 'numpy':numpy,
                 'math':math,
-                'scipy':scipy}
+                'scipy':scipy, 
+                'calc':calc, 
+                'eia':eia}
 
 class numericalresponse(object):
     def __init__(self, xml, context):

urls.py

@@ -19,7 +19,7 @@ urlpatterns = ('',
     url(r'^activate/(?P<key>[^/]*)$', 'auth.views.activate_account'),
     url(r'^$', 'auth.views.index'),
     url(r'^password_reset/$', 'django.contrib.auth.views.password_reset', 
-        dict(from_email='6002-admin@mit.edu'),name='auth_password_reset'),
+        dict(from_email='registration@mitx.mit.edu'),name='auth_password_reset'),
     url(r'^password_change/$',django.contrib.auth.views.password_change,name='auth_password_change'),
     url(r'^password_change_done/$',django.contrib.auth.views.password_change_done,name='auth_password_change_done'),
     url(r'^password_reset_confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$',django.contrib.auth.views.password_reset_confirm,