Fixed build for carrierwave 0.8 and 0.9

Conflicts:
	spec/mongoid_spec.rb