* master:
Renaming static.tar to static.tgz to reflect its gzippedness.
Fixing ghost unread counts on folder when last story in a feed is read.
Fixing link to scipy-superpack. (Thanks @boursier)
Handling negative feature page bug. Also showing server errors on bad emails.
Fixing missing username in dupe USF.
Handling errors on river in client. Also fixing starred stories.
Suppressing error on starring an already starred story.
Re-enabling mobile site. /m/
Fixing typo in aggressive feed fetching.
No longer being aggressive about finding a feed's correct address if it returns a 400 or 500 error code, unless it is still the first run or an exception refresh.
Adding SSL to nginx conf.
Conflicts:
apps/reader/views.py
assets.yml
media/js/newsblur/reader/reader.js
* master:
Adding error handling for insta-fetching stories.
Turning off the page fetcher requests vs. urllib2 discrepency checker. I bet I've caught them all by now.
The @kennethreitz commit: logging all discrepencies between requests and urllib2. This should take a few hours.