removed extra end in cancan
readded carrier wave
bundled lol
require carrierwave