Add'l tweaking of settings.py.
Fix merge conflict.
Incl. static directory on production machine.