Merge pull request #110 from MITx/settings-fix

settings import fix for mdx_circuit and mdx_image

djangoapps/simplewiki/mdx_circuit.py

@@ -17,7 +17,7 @@ circuit-schematic:[["r",[128,48,0],{"r":"1","_json_":0},["2","1"]],["view",0,0,2
 import markdown
 import re
 
-import simplewiki.settings as settings
+import simplewiki.wiki_settings as settings
 
 from django.utils.html import escape
 

djangoapps/simplewiki/mdx_image.py

@@ -15,7 +15,7 @@ Ex:
 Requires Python-Markdown 1.6+
 '''
 
-import simplewiki.settings as settings
+import simplewiki.wiki_settings as settings
 
 import markdown
 try:
@@ -66,4 +66,4 @@ def makeExtension(configs=None) :
 
 if __name__ == "__main__":
     import doctest
-    doctest.testmod()
\ No newline at end of file
+    doctest.testmod()