Update CONTRIBUTING.md
Merge pull request #1262 from sbt/topic/readme

Update CONTRIBUTING.md and README