Bug #1328716: Clean up CONTRIBUTING a bit.