restore settings import as django-appconf relies on it being there
Merge branch 'pyflakes'