3400 add link back to collection for prompt blurbs
When sorting by taggings count, also provide secondary sorting by name

Taggings count don't provide enough order - when too many tags have the same number of uses, the results of sorting are unpredictable and the order keeps changing.

This adds secondary sorting by name, ascending, when the taggings count is the same.
Issue 3285:  Include the site name in the sender field of notification emails
Fixing mailer issues
More rebase nonsense
Added tests
Created specs for the mailers
3769 In user navigation, make it My Preferences and remove subscriptions count
Merge remote-tracking branch 'christina/issue-3278-sorting-taggings-count' into Group_5

# By Cristina
# Via Cristina
* christina/issue-3278-sorting-taggings-count:
  When sorting by taggings count, also provide secondary sorting by name
Merge remote-tracking branch 'scottsds/issue_3285' into Group_5

# By Scott D. Sullivan
# Via Scott D. Sullivan
* scottsds/issue_3285:
  Created specs for the mailers
  Added tests
  More rebase nonsense
  Fixing mailer issues
  Issue 3285:  Include the site name in the sender field of notification emails
Merge remote-tracking branch 'sarken2/issue_3400' into Group_5

# By sarken
# Via sarken
* sarken2/issue_3400:
  3400 add link back to collection for prompt blurbs
Merge remote-tracking branch 'sarken2/issue_3769' into Group_5

# By sarken
# Via sarken
* sarken2/issue_3769:
  3769 In user navigation, make it My Preferences and remove subscriptions count