Bug #1328716: Clean up CONTRIBUTING a bit.

Per Bug #1328716, here's a patch that updates CONTRIBUTING to mesh better with README.  It also fills in some gaps, particularly with tools, and makes the workflow more clear.  Given that working on this patch is my first exposure to the workflow I have no illusions as to perfect accuracy.  So feedback would be much appreciated.
I don't think we want to take out mention of upstream here do we?