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
Merge pull request #1262 from elzj/has_many_bugs

Issues 3664, 3674, 3676: User work and series bugs
Issues 3665 and 3671: fix for phantom data in work form due to Rails association bug. Works are now told explicitly not to pull in chapters with null foreign keys.
Merge pull request #1263 from elzj/issue_3665_3671_null_associations

Issues 3665 and 3671: fix for phantom data in work form
Taking steps towards fixing the id column for filter taggings
Adding migration to restore primary key - currently only set to run in development
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