update carrierwave config
update carrierwave config
Merge branch 'master' of github.com:luketower/myflix-sep-2013