Merge branch 'master' into muserstory_remove

* master:
  Typo on duplicate feed saving truncation.
  Adding duplicate feed address+link truncation.
  Adding duplicate feed address+link truncation.
Merge branch 'muserstory_remove'

* muserstory_remove:
  Fixing remaining share hash bug. Shared stories wouldnt show as shared on original feed.
  Switching to faster unread counting for socialsubs and usersubs.
  Fixing mark as read bug for socialsubs.
  Removing story blurblog permalink, making it called explicitly.
  Adding node group to fabfile.
  Using popular instead of homepage user to suggest new users to follow.
  Cleaning up unused detritus. Ready to deploy.
  Final cleanup before deploying.
  Removing MUserStory entirely.
Merge branch 'master' into circular

* master: