Merge branch 'issue_3636' of git://github.com/cswatt/otwarchive
3636 Confirmation page text change
Merge pull request #1468 from sarken/issue_3636

3636 Account creation confirmation page should say wait 24 hours
Merge pull request #1461 from sarken/issue_3379

3379 Overflowing text in forms and pre tags
Merge pull request #1462 from scottsds/issue_3869

Issue 3869: Add the number of invites being sent out to Invite Request Page
Merge branch 'issue_3421' of github.com:sarken/otwarchive into issue_3782
Fix search in all the places it's broken, not just work queries
Only escape unescaped slashes
Merge pull request #1470 from elzj/search_500_fix

Fix search in all the places it's broken, not just work queries
Fix deploy script syntax for primary servers
Add bundle exec to whenever command
Merge branch 'master' into deploy
3819 Confirm messages for work and chapter deletion
3817 Move and comment function for JS deletion
3819 Update text of work deletion confirmation
3819 Add data-method in view rather than JS
3819 Don't use the JavaScript to add the data-method attribute
3819 proper class for h2
3819 Ha never mind -- keep the data-method in the JavaScript so the tests pass
3819 Left a line in from the rebase, whoops