Port preserve_files option from current version of paperclip

Conflicts:
	lib/paperclip/attachment.rb