* master:
Re-styling the crap out of all taskbar buttons. Much more streamlined now.
Tweaking the living crap out of the intelligence control's colors. Lightened.
User feedback: hiding positive and negative unread counts in title if there are no unread stories outside of neutral.
Correcting typo in dupe feed resolution.
Local settings in fabfile.
Fixing up a minor detail in the new intelligence control.
Rewriting intelligence slider to be an intelligence control (segmented control). Should make a ton more intuitive sense.
Trying to fix IE troubles by forcing single requests per read story.
Fixing nginx conf to support ssl.
Adding PID files to gitignore.
Ignoring files.
Adding certificates to ignore.
Adding https to nginx.
Conflicts:
media/css/reader.css
media/js/newsblur/common/assetmodel.js