Remove all uploaders and CarrierWave is no longer in the picture
Merge remote-tracking branch 'heroku/master'