Cutting number of feeds for fetching until mongo is sharded.
Adding cached template loader. Adding new mongodb.
Upgrading from PIL to Pillow.
Upgrading from PIL to Pillow.
Upgrading from PIL to Pillow.
Boosting feed fetches.
Last imports for pillow.
Fixing missing scipy import missing form PILlow.
Logging feed fetch deletions.
Pushing feed history deletion to end of stats collection.
Downgrading from Pillow, which is incompatible with PIL.
Adding expires header to icons.
64 sites, not 12 sites. Doh!
Fixing Google+ sharing.
Merge branch 'master' into circular

* master:
  Fixing Google+ sharing.
  64 sites, not 12 sites. Doh!
  Adding expires header to icons.
  Downgrading from Pillow, which is incompatible with PIL.
  Pushing feed history deletion to end of stats collection.
  Logging feed fetch deletions.
  Fixing missing scipy import missing form PILlow.
  Last imports for pillow.
  Boosting feed fetches.
  Upgrading from PIL to Pillow.
  Upgrading from PIL to Pillow.
  Upgrading from PIL to Pillow.
  Adding cached template loader. Adding new mongodb.
  Cutting number of feeds for fetching until mongo is sharded.

Conflicts:
	fabfile.py
Updating NewsBlur iOS enterprise to version 2.0.