Changed settings imports from [2639] to use 'from django.conf import settings', to make it easier to merge to magic-removal

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2640 bcc190cf-cafb-0310-a4f2-bffc1f526a37