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
Added feature to disable success_action_redirect and use success_action_status instead
Added require statments and included RecordIdentifier from ActionView since some methods will be deprecated from ActionController in Rails 4.1
Added rails 3.2 backward compatibility for tests
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 pull request #91 from nddeluca/fix-test-errors-with-rails-4

Fix test errors with rails 4
Merge branch 'add-success-action-status' of git://github.com/nddeluca/carrierwave_direct into nddeluca-add-success-action-status
Merge pull request #93 from dwilkie/nddeluca-add-success-action-status

Nddeluca add success action status
Added @nddeluca as a maintainer