modifying CONTRIBUTING.md to describe the rebasing workflow and commit s...

...quashing more explicitly