Update contribution guidelines

[ci skip]
Merge branch 'master' into geezer

[ci skip]