Update CONTRIBUTING.md

Add more information from the Spring Framework document on maintaining a linear history as well as some code-style information
Fix link in CONTRIBUTING.md