Renaming settings_sample.yaml to correct name.

Merge to close wrong branch.

Small stylistic changes.

(0) -30 -10 -3 +3 +10 tip

mercurial