Use multi_json explicitly, save 12MB
Incorrect parameter :hosts. Should be :host
Merge pull request #963 from whomwah/fix_readme

Error in README. Using Amazon S3 config options.
DRY database configuration and create test database automatically
Merge pull request #972 from AndreyChernyh/mysql-changes

DRY database configuration and create test database automatically
Added configuration param to disable SSL for public_url
The resize_to_fit process won't scale to 800x800 but 800x600
Merge pull request #978 from Bartj3/master

Fixes incorrect example in readme
Merge pull request #976 from u2illc/master

Added configuration param to disable SSL for AWS public_url
Merge branch 'multi-json' of git://github.com/ujifgc/carrierwave into ujifgc-multi-json
Add multi_json to gemspec
adding note to readme about s3
Merge pull request #989 from niedfelj/feature-s3-documentation

adding note to readme about s3 files with +
fixes CarrierWave.generate_cache_id to use UTC
Merge pull request #992 from artemas/master

Fixes #991, use UTC for CarrierWave.generate_cache_id
uri encode url path parts
Merge pull request #996 from taavo/uri_encode_url_path_parts

Uri encode url path parts
process_uri: only encode if invalid
Merge pull request #1000 from taavo/better_process_url

process_uri: only encode if invalid
Revert "adding note to readme about s3"

This reverts commit fb777d6c5082c5b190b9d9bd444038c9cd72527b.