CONTRIBUTING.md is out of date

Created by: matthew-d-jones

clang-format version (should be 3.9) and workflow (should be gitflow, branch from master) described are out of date.