Made change to get git working
Merge pull request #16 from matthewbarram/carrierwave_setup

Merging branch on github