Move rebase from README.md to CONTRIBUTING.md + fix a typo in doc/faqs

I've moved the  **Rebasing** section from README.md to CONTRIBUTING.md as it was being wrongly referred to in CONTRIBUTING.md and is more appropriate there.  Also fixed a typo in the docs.