Merge branch 'master' of github.com:thoughtbot/paperclip

Conflicts:
	spec/paperclip/validators/attachment_size_validator_spec.rb
Merge branch 'master' of github.com:kashif-umair/paperclip-new into readable_units