remove the need for settings/local.py (bug 1021991)
Merge pull request #483 from andymckay/999774

remove the need for settings/local.py (bug 999774)