Upgrade Rails to 3.2, upgrade other gems, and remove any replaceable plugins
Updating initializers for Rails upgrade
Updating tests with new Factory Girl syntax
Rails upgrade: updating tag associations and fixing filter tagging cleanup
Merging master, resolving Gemfile.lock conflict
Removing outdated debug_rjs line from config
Updating cucumber rails
Fixes for failing specs
Updating syntax of fixture steps
Setting Ruby version, tweaking paperclip version
Fix factory variables in pickle steps
Merge pull request #1256 from elzj/rails_32_upgrade

Rails 3.2 upgrade
Remove defunct error page handling, replace with exceptions app setting
Switching in aws-sdk gem for aws/s3
Merge pull request #1258 from elzj/rails_32_upgrade

Upgrade fixes: aws gem and error page generation
Bumping paperclip version to fix aws bug
Merge pull request #1259 from elzj/rails_32_upgrade

Bumping paperclip version to fix aws bug
Issue 3670: fix cache error on tag page by ensuring results to be cached are in array format.
Merge pull request #1261 from elzj/issue_3670_tag_error

Issue 3670: fix cache error on tag page
Update Ruby version