Issue #336 - Update CONTRIBUTING.md to be in sync with new workflow.

@karlcow, can you check this out? Please merge if it's OK.