* master:
Fixing bogus type error, caused by duplicate feeds.
Correcting styling on site settings loader icon.
Removing dupe migration from feed_settings.
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Fixing #41: Adding REDIS to local_settings.py.template.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""
Revert "Switching to requests from urllib2/httplib. Bring on the page errors."
Switching to requests from urllib2/httplib. Bring on the page errors.
Adding a bunch fo keyboard shortcuts.
Adding elapsed time field to river and feed view.
Fixing autolinking of text links to no longer indiscriminately replace text, causing double encoding of html entities.
Fixing the space bar key to not queue, so it's actually useful now!
Refining media enclosures by adding all types and linking to their source.
Refining media enclosure detection.
Conflicts:
config/nginx.newsblur.conf