Fix migration
Merge pull request #2102 from andymckay/999774

clean up settings (bug 999774)
Fix site settings imports after lib/settings_base move
remove the need for a settings_local.py file in dev (bug 999774)