Adding Search app and object, used to index stories and then search them. Needs views, ui, and support for saved stories.
Merge branch 'social' into search

* social: (597 commits)
  Updating celery calls in prep for upgrade to celery 3.0.
  Getting IE9 working with OPML ajax upload.
  Typo on never_cache after json view. Doh.
  Fixing the living crap out of IE9. Everything works excellently now.
  Upgrading jQuery 1.7.1 to 1.7.2 and upgrading bootstrap's carousel to 2.0.5.
  Adding _gaq for debug, when analytics aren't present.
  Taking @mgeraci's suggestion and moving the Starred! message to the opposite gravity of the story titles pane.
  Double clicking sites and stories now works. Thanks to @ojiikun for figuring this one out.
  Fixing scroll/paging bug where the wrong story would be selected. Technically it's not fixed, but the indicator is now always present, so you know why it's happening. Thanks to @afita for the thorough investigation.
  Lots of little bugs: avatar images, icon importer, page importer, adding analytics tracking to intro.
  Fixing following bug due to array truncation of following list.
  Small tweaks to blurblogs. iPadifying blurblogs.
  Adding /social/activities endpoint for Android and iOS.
  Fixing bug when a story changes its guid (like on a tumblr rename), but it still thinks it has comments. Forcing each story to recount its comments if comments are claimed, just in case.
  Showing social service fetch status in real-time (actually polling every 3 seconds) in both intro and friends dialogs.
  Fixing issue in social connecting to Twitter/FB in popup.
  Google Analytics on Blurblogs.
  Trying to outwit IE by adding in a fake console.
  console.log -> NEWSBLUR.log
  Adding sync status and tasking facebook/twitter friend imports.
  ...

Conflicts:
	settings.py
Making poor progress on search. Can't even query yet.
Merge branch 'master' into search

* 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
Updating search for saved stories to search fuzzy queries. Connected to UI.
Adding elasticsearch fabfile config.
Turning off auto-indexing for starred stories until it's ready to go.
Merge branch 'search'

* search:
  Turning off auto-indexing for starred stories until it's ready to go.
  Adding elasticsearch fabfile config.
  Updating search for saved stories to search fuzzy queries. Connected to UI.
  Making poor progress on search. Can't even query yet.
  Adding Search app and object, used to index stories and then search them. Needs views, ui, and support for saved stories.