Merge pull request #8 from RyanSnodgrass/fix_heroku

removed uploader from recipe and mixer controller
trying to add carrierwave gem back