Commit settings.php, use settings.local.php for local config.

Opening this for pros/cons discussion. Please don't commit until reviewed.