fix trap plugin to prevent infinite loop
Merge pull request #1202 from tuff-ghost/issue_3380e

3380e: fix trap plugin to prevent infinite loop
3371 Fix JS on maintenance page where livequery is not included
Merge pull request #1203 from sarken/issue_3371

3371 Fix JS on maintenance page where livequery is not included
change modal setup code to hide in-page modal content rather than remove it from the DOM
Merge pull request #1204 from tuff-ghost/issue_3380f

2066 & 3380: hide in-page modal content rather than removing it
3293 footer escapes wrapper
Merge pull request #1207 from sarken/issue_3293

3293 footer escapes wrapper
Adding JSON gem patch
Merge pull request #1209 from elzj/json_patch

Adding JSON gem patch
Issue 3593: Add Chapter number and Additional Tag info to mailers
Chapter and Work wordcount. Chapter-Work summary. Chapter number. All tags. Added these things
Merge pull request #1210 from scottsds/issue_3593

Issue 3593: Add Chapter number and Additional Tag info to mailers
Issue 3593: Fleshing out batch_notification mailers
Reducing complexity of if statement
more logic changes, jim
more logic changes, jim
Merge pull request #1212 from scottsds/issue_3593

Issue 3593: Fleshing out batch_notification mailers
Added Sauce Labs support for authenticate_users feature
Merge branch 'master' of git://github.com/DylanLacey/otwarchive into add_saucelabs_integration