update style guide with new spacing guide
Merge pull request #1826 from jlipps/master

update style guide with new spacing guide