Update contribution guidelines

Let's be extra clear.

[ci skip]
Merge branch 'master' into geezer