Consolidating code of conduct
Merge pull request #678 from gvwilson/consolidating-code-of-conduct

Consolidating code of conduct