Add code formatting commentary to CONTRIBUTING file
Merge commit '5fe0386b8d82e0de8257df8d1dd118e24524d572' into HEAD