Update contributing guide

Merged Zeger-Jan van de Weg requested to merge zj-update-contributing-guide into master