Added a note about rebasing-off-master to CONTRIBUTING.md

Contributors should rebase their feature branches off of master (and
moderators should double-check that this is the case) before the feature
branch can (will be) merged.