Merge pull request #227 from rrthomas/master

Add git-setup
Create CONTRIBUTING.md
Merge remote-tracking branch 'upstream/master'