* master: (26 commits)
Fixing unknown host error on DO servers.
Using All Site Stories instead of Top Level on folder chooser.
Adding new preference for auto-opening a default folder on load.
Unread counter overlay widget for feeds and social feeds.
Fixing memory leak when reloading feeds (after add/remove/move), found entirely through @mihaip's hard work. Thanks!
Disallowing single subscriber feeds to be loaded by non-subscribers.
Fixing #383. Need a way to retrieve starred stories by hash.
Previous story button takes you up, no longer to previous story. Should've done this a while ago.
Adding story intelligence score tip to API.
Adding user_profile to /reader/feeds. Has is_premium field, as well as web preferences.
Switching feed link to point ot the feed's permalink, not a feed filter on the blurblog.
Preventing popular from sharing stories from the same feed id in the same batch.
Upping delay on new user queue.
Fixing jenny holzer quote at end of blurblogs.
Adding better error logging/messaging for marking stories as starred.
Adding better error logging/messaging for marking stories as starred.
Fixing broken icon bug.
Fixing missing user_id in comment's replies and likes.
Posting popular shared stories to twitter.
Boosting shared stories on popular.
...
Conflicts:
apps/reader/views.py
* master:
Trying to fix the unread counts ghosting issue by forcing an instant unread count refetch of active/selected feeds. This may work!
Fixing limits.conf to just use integers.
Making it a bit easier to setup a new db.
Updating Android app to v1.1 (revision 31).
* social:
Auto-linkifying comments and replies, and stripping html from comments, replies, and story titles, tags, and authors.
Adding compacting to user sub folders, to remove dupe subscriptions.
Clearing folders and decoding unicode.
Typo in gunicorn conf.
Only using appropriate number of gunicorn processes, making this machine agnostic.
Deferring OPML import if it takes > 20 seconds. Email user when complete. Also, hamburgers. This one's for @torrez.
Adding vps roles to fabfile.
Conflicts:
apps/reader/views.py
apps/social/models.py
