set up carrierwave config
arghhhh merge!
fix merging issue