performance: only require 'aws/s3' if it isn't already loaded

lib/paperclip/storage/s3.rb

@@ -63,7 +63,7 @@ def self.extended base
         rescue LoadError => e
           e.message << " (You may need to install the aws-s3 gem)"
           raise e
-        end
+        end unless defined?(AWS::S3)
 
         base.instance_eval do
           @s3_credentials = parse_credentials(@options[:s3_credentials])