Render list of stories in the HTML email as an actual unordered list
Changed claim notification email subject lines to refer to "works" rather than "stories"
Merge branch 'master' into 3929-claim-emails-redux
Added tests for the claim notification and the invitation to claim emails.
Merge branch 'master' into 3929-claim-emails-redux
Reverted some changes to factories.rb since the problem I am getting appears to be environmental.
Merge branch 'master' into 3929-claim-emails-redux
3929 - Replaced a remaining link_to with style_link in the HTML email to display it as a coloured link red
Merge remote-tracking branch 'remotes/upstream/master' into 3929-claim-emails-redux
3929 Corrected links in HTML emails and removed them from text versions. Added tests.
3175 Better note about characters for user and collection names
3175 Shorten name footnote a bit
3655 Fix further inconsistencies in help text
Merge pull request #1644 from sarken/issue_3169_3175

3175 Better note about characters for user and collection names
Merge pull request #1547 from ariana-paris/3929-claim-emails-redux

3929 claim emails redux
Merge pull request #1645 from sarken/issue_3655

3655 Fix further inconsistencies in help text
3 works just turned 2, so now the test for 2 year old works should find 4 instead of 1
Merge pull request #1648 from sarken/happy_birthday_works

3 works just turned 2, so now the test for 2 year old works should find ...
Updates to Travis config for elasticsearch
Merge pull request #1650 from scottsds/fix_elasticsearch_on_travisci

Updates to Travis config for elasticsearch