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.
Resolving merge conflict
Issue 3580: Integrate with Travis-CI
Changing Travis-CI Config
Merge pull request #6 from scottsds/better_Travis

Better travis