Merge pull request #427 from MITx/feature/bridger/new_wiki

New wiki installed from pip

.gitmodules

 [submodule "askbot"]
 	path = askbot
 	url = git@github.com:MITx/askbot-devel.git
-[submodule "lms/djangoapps/django-wiki"]
-	path = lms/djangoapps/django-wiki
-	url = git@github.com:benjaoming/django-wiki.git

django-wiki @ 484ff1ce

-Subproject commit 484ff1ce497574045e78d4e3ea0ff55ac9b4bd30

lms/envs/common.py

@@ -90,7 +90,6 @@ sys.path.append(REPO_ROOT)
 sys.path.append(ASKBOT_ROOT)
 sys.path.append(ASKBOT_ROOT / "askbot" / "deps")
 sys.path.append(PROJECT_ROOT / 'djangoapps')
-sys.path.append(PROJECT_ROOT / 'djangoapps' / 'django-wiki')
 sys.path.append(PROJECT_ROOT / 'lib')
 sys.path.append(COMMON_ROOT / 'djangoapps')
 sys.path.append(COMMON_ROOT / 'lib')

requirements.txt

@@ -44,4 +44,5 @@ django-ses
 django-storages
 django-threaded-multihost
 django-sekizai<0.7
+git+git://github.com/benjaoming/django-wiki.git@484ff1ce49
 -r repo-requirements.txt