Merge cleanup, Adding CONTRIBUTING.md