if %w(development test cucumber performance).include?(Rails.env)
  s3_decision = {}
else
  s3_decision = {
    storage:         :fog,
    path:            ":class/:attachment/:id/:style/:filename",
    fog_credentials: {
      aws_access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
      aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
      provider:              'AWS'
    },
    fog_directory:   ENV['AWS_BUCKET'] || "afdev-#{Rails.env}",
    fog_public:      :public
  }
end

Paperclip::Attachment.default_options.merge!(s3_decision)
Paperclip.options[:command_path] = ["/usr/local/bin", "/usr/bin"]

if %w(development test cucumber performance).include?(Rails.env)
  s3_decision = {}
else
  s3_decision = {
    storage:         :fog,
    path:            ":class/:attachment/:id/:style/:filename",
    fog_credentials: {
      aws_access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
      aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
      provider:              'AWS',
      region:                'us-west-1'
    },
    fog_host:        "s3.amazonaws.com",
    fog_directory:   ENV['AWS_BUCKET'] || "afdev-#{Rails.env}",
    fog_public:      :public
  }
end

Paperclip::Attachment.default_options.merge!(s3_decision)
Paperclip.options[:command_path] = ["/usr/local/bin", "/usr/bin"]

--- 
+++ 
@@ -7,10 +7,8 @@
     fog_credentials: {
       aws_access_key_id:     ENV['AWS_ACCESS_KEY_ID'],
       aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
-      provider:              'AWS',
-      region:                'us-west-1'
+      provider:              'AWS'
     },
-    fog_host:        "s3.amazonaws.com",
     fog_directory:   ENV['AWS_BUCKET'] || "afdev-#{Rails.env}",
     fog_public:      :public
   }
Remove us-west-1 from the S3 bucket
