Force all feed queries to use redis.
Removing unused redis story objectid db.
Merge branch 'preshard'

* preshard:
  Removing unused redis story objectid db.
  Force all feed queries to use redis.
Merge branch 'preshard' into circular

* preshard:
  Removing unused redis story objectid db.
  Force all feed queries to use redis.
Fully converting feeds and folders to use redis-only read stories (removing MUserStory). Still need to do socialsubs.
Change crossover to narrow view from 700 to 720px.
Adding MUserStory back in when reading and unreading, to maintain backwards compatibility.
Merge pull request #228 from daanzu/master

Change crossover to narrow view from 700 to 720px.
Fixing issue where user agent doesn't exist.
Merge branch 'master' into circular

* master:
  Fixing issue where user agent doesn't exist.
  Change crossover to narrow view from 700 to 720px.

Conflicts:
	media/js/newsblur/reader/reader.js
Tightening up unread counts.
Fixing bug in autocomplete returning lost feeds.
Merge branch 'master' into circular

* master:
  Fixing bug in autocomplete returning lost feeds.

Conflicts:
	apps/rss_feeds/views.py
Using story cache when calculating unreads, for those who need unread counts updating.
Merge branch 'master' into ruserstory

# By Samuel Clay (2) and daanzu (1)
* master:
  Fixing bug in autocomplete returning lost feeds.
  Fixing issue where user agent doesn't exist.
  Change crossover to narrow view from 700 to 720px.
Better iPad/iPhone screenshots.
Merge branch 'master' into circular

* master:
  Using story cache when calculating unreads, for those who need unread counts updating.
Moving river blurblog to no longer use MUserStory.
Merge branch 'master' into ruserstory

* master:
  Using story cache when calculating unreads, for those who need unread counts updating.
Fixing reading stories in river blurblog.