Fix-up suggestions from the OS Contrib meeting, and add style guide to...

`contributing.md` to describe how the changes were made.

Final changes for #1302 .