Some minor updates to the CONTRIBUTING.md document

Added information about the GitHub workflow from http://scottchacon.com/2011/08/31/github-flow.html
Merge pull request #6 from jamiereid/master

Updates to the CONTRIBUTING.md document