* grid: (26 commits)
Adding mark read on story titles scroll preference, defaulting to off.
Fixing failed unread sentiment opacity bug.
Changing settings text.
Bumping nltk to 2.0.5
Adding ios preference to disable swiping of feed or story titles.
Updating inappsettingskit.
Removing backported grid fix.
Marking stories read as they are scrolled past.
Removing log.
Fixing broken view swap.
Preventing undefined view layout to take control.
Capturing undefined view settings.
Correctly re-rendering story titles when switch into and out of grid layout.
Font sizes for grid.
Finishing up overriding grid columns. Need to fix active story and font size changes.
Fixing image loading on grid. Only loads images > 100 px wide.
Adding link in preferences to clear all overridden story layouts and story views.
Moving authors to bottom of grid story title.
Laying out web now only refreshes right side when changing views. Faster and smoother.
Grid columns override. Still needs override.
...
* master: (42 commits)
Switching to new redis sessions db.
If text fails to fetch, tapping the text button should not change the text lock.
Fixing Feed view space bar scrolling bug where story is collapsed.
Adding new space bar behavior to full view as well.
Fixing space bar scrolling in list view.
Adding 'm' keyboard shortcut to toggle read/unread.
Shift+space goes backwards too.
Jumping to next story when scrolling using space bar.
Handling timeout on original page fetch.
Fixing timeout error on PUSH. Also fixing requests error on page importing.
Boosting timeout on analtics cleaning.
Adding fetch original page to msharedstory.
Fixing switching to and from text mode while still in current feed. Now to change river so that it uses text view setting from feed, not folder (unlike web).
Cutting unneccessary logging.
Adding user agents to logging. Reeder, Fever, Superfeedr, Old Reader, IE11.
Adding modern android app user agent in logging.
Switching back to original redis server for sessions while the new sessions server gets monitored.
Adding redis sessions db.
Making text view sticky on ios. Maybe bugs?
Upgrading to redis 2.8.
...
Conflicts:
media/js/newsblur/reader/reader_preferences.js
