Merge branch 'master' of github.com:dwilkie/carrierwave_direct

Conflicts:
	README.md
	lib/carrierwave_direct/uploader.rb
	spec/uploader_spec.rb
Merge branch 'master' of github.com:jkamenik/carrierwave_direct