Cleaning up certs for new certificate.
Fixing river blurblog when user has shared one of the stories.
Merge branch 'master' into circular

* master:
  Fixing river blurblog when user has shared one of the stories.

Conflicts:
	apps/social/views.py
Grammar fix in email base. Thanks @alankarma.
Making river queries waaaay faster for all site stories by only getting feed ids.
Merge branch 'master' into circular

* master:
  Making river queries waaaay faster for all site stories by only getting feed ids.
Adding order/read_filter to river log.
Merge branch 'master' into circular

* master:
  Adding order/read_filter to river log.
New API endpoint: /reader/unread_story_hashes.
Merge branch 'master' into circular

* master:
  New API endpoint: /reader/unread_story_hashes.
Logging unread story hashes.
Merge branch 'master' into circular

* master:
  Logging unread story hashes.
Slight improvement to unread story hashes endpoint by skipping feeds with no neutral/positive unreads.
Merge branch 'master' into circular

* master:
  Slight improvement to unread story hashes endpoint by skipping feeds with no neutral/positive unreads.
Merge pull request #250 from ojiikun/circular

Android: New Folder Icons/Colours, Remove Feed-View Intel
Adding automated redis backup.
Cleaning up time calibration code for new servers.
Adding dynamic ssh and fab hosting by querying digitalocean on every command.
Entitlements.
Merge branch 'master' into circular

* master:
  Adding dynamic ssh and fab hosting by querying digitalocean on every command.
  Cleaning up time calibration code for new servers.
  Adding automated redis backup.