Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Moving all pubsub to a dedicated redis box (called REDIS2).
Fixing fabfile.
Switching to new pubsub redis server.
Moved the URL schema (http://) into NEWSBLUR_URL
Introduced NEWSBLUR_HOST for couple of cases where NEWSBLUR_URL was being used as a hostname
Switched default URL to https://
Merge branch 'rhistory'

* rhistory:
  Switching to new pubsub redis server.
  Fixing fabfile.
  Moving all pubsub to a dedicated redis box (called REDIS2).
Bumping up speed for free user queue.
Merge remote-tracking branch 'upstream/master'
Clearing up logic on find_story.
Moving notifier to correct position for both feed list and feed detail. Also responds perfectly to orientations, even on different views.
Merge pull request #307 from pabloav/master

Enable SSL for most HTTP transactions.
Have the All Stories view query by wildcard, not ID list.
Make AllStories and FolderStories views match.
Merge pull request #309 from ojiikun/master

Android: Fix All Stories View
Adding a bit of skeleton for offline feeds.
Fixing middleware to activate users. Faulty paths resulted in paths that had a / not being recognized. Thanks to @subglass!
Fixing j/k keyboard shortcuts when story titles are hidden.
Turning off forked mongoengine for now.
Merge branch 'master' into offline

# By Samuel Clay (3) and others
# Via Samuel Clay (3) and ojiikun (3)
* master:
  Turning off forked mongoengine for now.
  Fixing j/k keyboard shortcuts when story titles are hidden.
  Fixing middleware to activate users. Faulty paths resulted in paths that had a / not being recognized. Thanks to @subglass!
  Make AllStories and FolderStories views match.
  Have the All Stories view query by wildcard, not ID list.
  Moved the URL schema (http://) into NEWSBLUR_URL Introduced NEWSBLUR_HOST for couple of cases where NEWSBLUR_URL was being used as a hostname Switched default URL to https://