Merge pull request #1 from dwilkie/master

getting newest code
Ignoring RubyMine IDE files
Merge branch 'master' of https://github.com/jkamenik/carrierwave_direct

Conflicts:
	.gitignore
Adding 1.9.2 support
Switching to secure gem host
Re-removing 1.9.2
Fixing the uploader to always provide content_type
Describing the changes to Content-Type
making it so content-type is encoded in the form
Adding mime-types to the content type selector
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:dwilkie/carrierwave_direct

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

Conflicts:
	lib/carrierwave_direct/form_builder.rb
	lib/carrierwave_direct/uploader.rb
	spec/form_builder_spec.rb
Fixing bad merge
Adding default content type and allowed content types configs
Read the default content types from the config
Adjusting the read me.
Fix readme formatting
Adding a direct uploader config example