Update CONTRIBUTING.md

Lots of updates