changing for conspires setup
Update README.md
merge latest thoughtbot
merge readme
Merge pull request #1 from StewartJarod/master

Conspire-ified