Update contribution guidelines for branching.
Fix trailing whitespace.
Minor wording and formatting change.
Merge pull request #121 from dougborg/contribution_documentation_update

Contribution Guidelines Update Re: Branching, Take 2