Merge pull request #1486 from MITx/feature/ned/clean_up_tests

We no longer need override_settings, Django has a better one.

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -1,7 +1,7 @@
 import json
 import shutil
 from django.test.client import Client
-from override_settings import override_settings
+from django.test.utils import override_settings
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path

cms/djangoapps/contentstore/tests/tests.py

@@ -1,7 +1,6 @@
 import json
 import shutil
 from django.test.client import Client
-from override_settings import override_settings
 from django.conf import settings
 from django.core.urlresolvers import reverse
 from path import path

cms/djangoapps/contentstore/tests/utils.py

@@ -2,7 +2,6 @@ import json
 import copy
 from time import time
 from django.test import TestCase
-from override_settings import override_settings
 from django.conf import settings
 
 from student.models import Registration