Update .gitignore

added vim swp files
Merge branch 'master' of git://github.com/otwcode/otwarchive

updating my master branch
Merge branch 'master' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
Merge branch 'master' of git://github.com/otwcode/otwarchive
2394 Redirects user to chapter page if work is multichaptered
Link to chapters in Entire Work mode instead of Chapter by Chapter mode
Fixes history for multichapter works that broke after the title fix
Destroy filter tagging when filter (tag) is destroyed

Check that filter isn't nil before attempting to expire the cache on it
Correct wording in draft purge rake task
Refactoring to new active record syntax

Also, it's more informative to show an "i out of n" counter when going through existing taggings. Though I don't know if we'll use that method again on all our millions (of filter taggings). *g*
Comment out the revert filter taggings migration to stop migrations from failing
Update admins.yml and users.yml to work when seeding
Change filter_taggings table creation
Merge branch 'refs/heads/master' into issue-3939-filter_taggings
Taking out the dependent destroy bit, because not sure it's the right thing and is not connected to the bug at hand
Destroy wrangling assignments when user is deleted
Rake task to fix existing taggings_count below zero
Issue 3034: Invitations link for non-existing user causes error 500