* master: (27 commits)
Removing log override
Moving logging over to the newsblur log.
Fixing search indexer background task for new celery.
Attempting to add gunicorn errors to console/log.
Better handling of missing subs.
Handling missing user sub on feed delete.
Correct encoding for strings on systems that don't have utf-8 as default encoding.
Writing in the real urllib3 dependency for requests.
Upgrading requests due to urllib3 incompatibility.
Login required should use the next parameter.
Upgrading django oauth toolkit for django 1.11.
Handling newsletters with multiple recipients.
Extracting image urls sometimes fails.
Handling ajax errors in json views.
Adding timeouts to most outbound requests.
Sentry SDK 0.19.4.
Removing imperfect proxy warning for every story.
Found four more GET/POST crosses.
Feed unread count may need a POST.
Namespacing settings.
...
* 'master' of github.com:samuelclay/NewsBlur:
Adding all mongodb munin plugins, and adding fab command to install munin plugins for mongo.
Upgrading requests's ConnectionError to a first-class error, marking page as bad url.
Python module requests now throwing ConnectionError on bad urls. Handling by not emailing me about it.
Conflicts:
fabfile.py
