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
Merge branch 'has_many_bugs' of github.com:elzj/otwarchive into rails_32_new
Tag Cloud Fixes, series and user scopes
Merge branch 'master' into rails_32_new
Merge branch 'filter_taggings_pk' into rails_32_new
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
Tag Cloud Fixes, series and user scopes
Challenge fixes
Brining filter_id fix into this branch
Collection fixes