Add'l edits to README.md and settings.py.
Fix some merge conflicts.