* muserstory_remove:
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.
* master:
Publishing realtime update when marking feed as read, only if it was actually marked as read.
Turning off real-time on mark_feed_as_read. Too much!
* ruserstory:
Adding real-time update on marking feed as read.
Remvoing unused everything_unread param from river stories.
Using story_hashes instead of fetch_stories parameter.
Moving read stories over to RUserStory when merging feeds.
Cleaning up MUserStory imports.
Speeding up blurblog sub counter b yonly using unread stories instead of all stories since a certain date.
Speeding up unread story counts.
Speeding up unread story counts.
Adding force calculate sub scores option.
Showing starred and shared status on global/river blurblog.
Fixing global feed to show read stories.
Fixing reading stories in river blurblog.
Moving river blurblog to no longer use MUserStory.
Adding MUserStory back in when reading and unreading, to maintain backwards compatibility.
Fully converting feeds and folders to use redis-only read stories (removing MUserStory). Still need to do socialsubs.
Conflicts:
apps/reader/views.py
apps/social/models.py
* story_hash_2:
Another bug found by @kyleniemeyer's story. a - b was supposed to be b - a.
Fixing Global shared stories by checking for missing story hashes properly.
Using index in msharedstory search.
Using new story_hashes instead of story object ids.
Conflicts:
apps/social/models.py
* master:
Fixing huge bug in mark_feed_read for socialsubs.
Increasing logging on read social sub stories.
Shift+a to mark as read for blurblogs.
Shift+a to mark as read for blurblogs.
Marking as read covers both socialsubs and feeds.
Conflicts:
apps/reader/views.py
* master:
Syncing redis on 1% of feed loads.
Cutting off syncable stories.
Adding pipeline for redis sync on usersub.
Adding user+feed user story sync, to be used soon on feed requests to clean out users read stories.
Forcing pipeline to flush every 1000 stories.
