Merge branch 'carrierwave'

config/initializers/carrierwave.rb

@@ -1,5 +1,3 @@
-require 'carrierwave/orm/mongoid'
-
 begin
   db_config = YAML::load(File.read(File.join(Rails.root, "/config/mongoid.yml")))
 rescue
@@ -12,4 +10,6 @@ CarrierWave.configure do |config|
   config.grid_fs_port = db_config[Rails.env]['port']
   config.storage = :grid_fs
   config.grid_fs_access_url = "/gridfs"
-end
+end
+
+CarrierWave::SanitizedFile.sanitize_regexp = /[^[:word:]\.\-\+]/