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
Capybara settings to help 1.0 -> 2.1 upgrade
Capybara matchers update
Users working
Fixing travis version
Fixing tag_controller error from master
Issues 3664, 3674, 3676: Rewriting user associations to not be horribly broken, and fixing error on user series pagination
Tweaking series anon scope to work properly
Typo fix
Merge branch 'has_many_bugs' of github.com:elzj/otwarchive into rails_32_new
Tag Cloud Fixes, series and user scopes