Fix settings.py for portability
Merge branch 'settings'