Conflicts:

	lib/paperclip/attachment.rb
	lib/paperclip/thumbnail.rb

Paperclip error thrown on assign, not when attachment declared. Added :s3_domain_url and :s3_path_url for differing S3 URL styles. Added s3_protocol for using http over https.

For "Assigning <file> to attr" log message, .inspect instead of implicit .to_s so nil assignments don't look ass ("Assigning  to attr" instead of "Assigning nil to attr").

Changed the default path listed in the comments of the Storage module. The default path now listed matches the default path from attachment.rd line 9

slight refactoring in geometry.rb to - only calculate transformation ratio if image needs to be cropped (Clemens Kofler)

Removed extra filename parsing in metadata cleaner. If it hadn't been done yet, your files won't be renamed anyway.