Merge pull request #826 from cobyism/rework-contributing-guides

Better contributing guidelines