carrierwave is working for the most part ... need to get rmagick in there
Merge branch 'master' into ryan