Merge branch 'master' into ruserstory

* master:
  Removing unnecessary redis sync call on feed load.
  Android 1.3.2.
Merge branch 'ruserstory'

* 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.
Keeping read_status consistent as an integer, not a boolean.
Merge branch 'master' into circular

* master:
  Keeping read_status consistent as an integer, not a boolean.