Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki

lms/envs/aws.py

@@ -56,3 +56,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
 
 XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
+
+if 'COURSE_ID' in ENV_TOKENS:
+    ASKBOT_URL = "courses/{0}/discussions/".format(ENV_TOKENS['COURSE_ID'])
+

lms/envs/dev_mongo.py

@@ -14,6 +14,7 @@ MODULESTORE = {
             'db': 'xmodule',
             'collection': 'modulestore',
             'fs_root': GITHUB_REPO_ROOT,
+            'render_template': 'mitxmako.shortcuts.render_to_string',
         }
     }
 }