Update CONTRIBUTING notes to reflect the changes for git-flow