* master:
Warning on missing maintenance.
Further pushing out feed updates.
Using @dcramer's excellent getsentry.com for all exceptions. Turning off exception emails.
Further pushing down feed fetches to handle load until db is scaled out.
Scrolling code blocks.
New task servers.
Turning down feed fetches.
If requests.raw won't work, sut fudge it with a StringIO for now.
Further turning down feed fetches until mongo is ready to replicate.
Fixing Facebook image calculation.
Fixing facebook posting.
Moving shared story unread recalc to background task. Will greatly speed up sharing.
Ramping down feed fetching until they can be handled.
Only show time breakdown when > 1 sec.
Fixed API docs for /reader/river_stories
make fabfile.py use requirements.txt
Make sure to send the proper content-type with social feeds
Restore default whitespace to pre/code blocks
Phase 2: switching to using story_hash index instead of compound unique story_feed_id/story_guid index.
document keyboard shortcut to add site/folder
Conflicts:
apps/social/views.py
