More work on CONTRIBUTING.rst