more changes and tweaks
Changes to carrierwave and other stuff