* master: (1171 commits)
Fixing repeating friend finding check in both intro and friends dialog.
Saving references to visible feeds when reading by folder.
Major refactor of ios feed list. No longer relies on fragile locations dictionary.
No more error messages on deploying new celery/gunicorn. Also adding NUMA cancellation support to mongo db server.
Fixing ios classifiers in river view.
Adding beta search (only titles and authors for now) for staff only.
Updating enterprise distribution ipa.
Fixing crash when mis-counting feeds. Correcting height of font popover on iphone. Adding horizontal bounce to story page control.
Doubling resync likelihood.
Clearing out old read stories for 1% of all feed fetches with new stories.
Adding unread cutoff to redis sync.
Syncing redis keys by feed_id for read stories.
Adding a sync all redis for user stories to be run in a migration.
Turning off deletion of old stories until the db can be prepped.
Adding index for read story deletion.
Deleting old stories.
Typo in delete read stories log.
Typo in delete read stories log.
Typo in delete read stories log.
Deleting old user stories again. This time going out to 5 times the unread bounds.
...
Conflicts:
local_settings.py.template
settings.py
* master: (331 commits)
Adding blurblog permalink to story on blurblog. Adding story slug to permalink. Fixing story guid hashes.
Re-enabling message property for facebook.
Ignoring image for facebook shares.
Commenting out facebook share message until they approve it.
Cleaning up Facebook og description.
Facebook using a website instead of article.
Facebook being a PITA.
Facebook wants ISO8601 datetime format.
Facebook doesn't like going to other URLs.
Facebook doesn't like going to other URLs.
Dumb typo in new facebook og crap.
Using blurblog permalink for new facebook shares.
Fixing Facebook share to use fancy actions.
Adding scroll to comments button to share bar. Thanks @afita.
Turning off microformats for more errors.
Fixing errors in timeouts to show the correct error. Also fixing microformats parsing issue and allow IPv6 URLs in enclosures to be ignored, fixing a bunch of feeds.
Cleaning redis stories for 1% of all feed fetches.
Refreshing feed on fetch.
Fiddling with logging on dupe feeds.
Adding bs facebook assets.
...
Conflicts:
apps/rss_feeds/models.py
settings.py
utils/feed_fetcher.py
* master:
Updating favicon to include 64x64 icon for Metro.
Marking shared stories as read.
Coering story content into unicode to handle changes.
Fetching more stories.
Moving from Aaron Swartz's html diff lib to lxml's html diff lib. Should fix issues around disappearing content.
Favicon for IE9 and for 32x32.
Trying to repair favicon for ie9 users.
