Move contribution guidelines into CONTRIBUTING.md
Merge branch 'master' into rename