Ensure file is rewind before saved on AWS using S3 or Fog
 fix lost during merge of io_adapter commit (89c8d117e756815333a0e46d387cd64a1f4d37ab)
 previous commit 7cb73846811b797fadfd8dca0917bafc7a06b84e
add readchar/readbyte on file adapter
Merge branch 'master' of git://github.com/thoughtbot/paperclip

Conflicts:
	lib/paperclip/io_adapters/file_adapter.rb
	test/io_adapters/file_adapter_test.rb
	test/storage/fog_test.rb
	test/storage/s3_test.rb