More tweaks for carrierwave and heroku.