Stubbing out starred story tags.
Adding story tagging UI to sideoptions.
Merge branch 'master' into tagging

* master:
  Adding folder search for admin only. If you're reading this commit message, don't get excited. I probably won't be launching folder search using this method. It'll be a while before I can ship it. But if for some strange reason folder search is much faster than I thought, this has a chance.
  Fixing rounded corners on Android. Also fixing a few spacing issues.
Adding tagging. Need to fix the auto-resizing, but tagging is looking good.
Logging heights.
Merge branch 'master' into tagging

* master:
  Showing OPML errors and fixing unicode decode error by sanitizing OPML uploads.
Merge branch 'master' into tagging

* master:
  Fixing sideoptions when on bottom.
  Correcting homepage river number.
Trying to rewrite sideoptions resize.
Fixing inconsistency when opening both sideoptions.
Merge branch 'master' into tagging

* master:
  Handing out free accounts a little quicker.
  Adding count of trimmed stories.
  Adding redis backup for new redis stroy server.
  Adding Buffer as a share option.
  Moving story hash db to its own server (primary).
  Adding cost to fabfile's list_do.
  Moving node server to db pubsub role.
  Moving from specific db hosts to db roles, editable through /etc/hosts.
  New ssh keys, syn_cookies setting for redis pubsub server.
  Handling socket level errors in socketio/node.
  Catching exceptions for node redis.
  Catching exceptions for node redis.
  Trying to fix issues on node redis connection.
  Handling redis connection timeouts in node.
Sending user_tags on story tagging (both additions and subtractions). Upgrading Backbone to 1.0 for improved model silencing behavior.
Merge branch 'master' into tagging

* master:
  Correct haproxy config to account for new http layer 7 health checks from nginx.
  Cleaning up haproxy debug, logrotate.
  Stripping tags in blurblog settings.
Storing user tags and retrieving in all views.
Showing tags on load. Just need counts and tag feeds.
Stubbing in collapse folder icon for starred stories.
Merge branch 'master' into tagging

* master:
  Only turn real-time feeds into lazy feeds if there is a track record of push notifications.
  Switching Email Story menu item to show email icon.
  Turning off redis dupe story id writer.
Merge branch 'master' into tagging

# By ojiikun (6) and Samuel Clay (3)
* master:
  Adding ellipses in webkit.
  Adding downtime handling to readme.
  Putting a max on sporadic checks on broken feeds to 8x normal amount.
  Complete styling of overlay buttons.
  Placeholder styling of overlay buttons.
  Enable/disabe state for overlay buttons.
  Make overlay buttons fuctional.
  Basic overlay button UI.
  Fix crash on marking all stories read (#382)
Merge branch 'master' into tagging

* master:
  Handling stats feed count for blurblog itself.
  Showing correct feed titles in blurblog stats.
  Fixing broken social stats.
Updating counts for tagged stories.
Stubbing in js model for starred story tags.