Merge pull request #2277 from mboersma/gitignore-collapse

ref(.gitignore): collapse distributed patterns into root .gitignore

Author: mboersma

deis/.gitignore

@@ -322,7 +322,7 @@
 # and production.
 # The local_settings.py file should *not* be checked in to version control.
 try:
-    from .local_settings import *  # @UnusedWildImport # noqa
+    from .local_settings import *  # noqa
 except ImportError:
     pass