remark on "merge of" syntax
use separate branches for pull requests
Merge pull request #547 from mikeshulman/contributing

Some updates to CONTRIBUTING.md