rm'd Setup.hs
Update README.md
Merge branch 'master' into snapSkeleton
Merging master into snapSkeleton, 1 minor conflict