fix(controller): use django.conf

you should always import from django.conf rather than importing
from the local package. That way, things like the
@override_settings decorator in Django 1.4 will work.

See also 3c6d792 and #547

Author: Matthew Fisher

controller/api/tests/test_app.py

@@ -12,7 +12,7 @@
 from django.test import TestCase
 from django.test.utils import override_settings
 
-from deis import settings
+from django.conf import settings
 
 
 @override_settings(CELERY_ALWAYS_EAGER=True)

controller/api/tests/test_hooks.py

@@ -11,7 +11,7 @@
 from django.test import TransactionTestCase
 from django.test.utils import override_settings
 
-from deis import settings
+from django.conf import settings
 
 
 @override_settings(CELERY_ALWAYS_EAGER=True)

controller/registry/__init__.py

@@ -1,6 +1,6 @@
 import importlib
 
-from deis import settings
+from django.conf import settings
 
 # import the registry module specified in settings
 _registry_module = importlib.import_module(settings.REGISTRY_MODULE)

controller/registry/private.py

@@ -6,7 +6,7 @@
 import urlparse
 import uuid
 
-from deis import settings
+from django.conf import settings
 
 
 def publish_release(repository_path, config, tag):