Updated from upstream master
Removed unwanted document...
Amended claim_notification method to enable it to send to Users as well as ExternalAuthors.
Amended import to include users as well as external authors.
Reinstated collection-related prompts.
Added handling to create a valid new user.
Corrected import URL so redirects will work
Moved all the 852-specific code into the mass_import file at shalott's request.
Removed hard-coded webdev path and personal email address.
Added new text version of claim_notification view and merged user_mailer with the one in master.
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