* master:
Adding MongoDB logging for debug.
Being far kinder during feed exception handling and showing users error text. Cannot believe this wasn't there.
Conflicts:
media/css/reader.css
templates/base.html
utils/json_functions.py
* master:
Adding asset-less deployment.
Upgrading feedparser from 5.0.1 to 5.1.
Catching errors in page links with ill-formed urls.
Not showing the world favicon until favicons are downloaded.
Fixing feed exception dialog to actually reload feeds on the page.
Geometrically decaying feed fetches on known good feeds that have gone bad.
Fixing issue around empty original pages.
Conflicts:
media/js/newsblur/reader/reader.js