Initial stub of Jammit assets.
JS is now complete. Need to fix css embeds.
Adding jQuery 1.7 and new static directory.
Adding /static to nginx conf.
Merge branch 'master' into jammit

* master: (48 commits)
  Updating copy on homepage.
  Marking all as read on Everything view should clear folder unread counts.
  Fixing error on committing to cache for rate limits when the dummy cache backend is used.
  Adding linux.com story to press page.
  Uniqifying stories when read.
  Moving from sha module to hashlib.
  Syncing time to account for time drift on VPS.
  Fixing issue around showing too many Oh Nos on abort.
  Save hash for address+link migration. necessary for a unique index.
  Deprecating db02, moving redis and rabbitmq over to db01.
  Updating nginx conf to support better amintenance pages giving a 503 status code.
  Moving NewsBlur counts to beginning of title.
  Fixing that crummy missing existing story issue.
  Updating feedparser.
  Fixing broken hashlib issue with feeds and no link.
  Adding MongoDB slave to local_settings template.
  Adding two new columns, necessary for the feed_settings branch: hash of address+link, and locking address.
  Marking read stories in Feed view as very much read. Gradientizing, too.
  Fixing /m/ for no good reason.
  File under "fucking finally": Adding client-side error handling and callbacks for feeds and river.
  ...

Conflicts:
	config/nginx.newsblur.conf
Merge branch 'feed_settings' into jammit

* feed_settings:
  Adding migration for unique hashes on feed addresses + links.
  Counting subscribers on branched feeds correctly, so as to maintain update frequency, even though it's branched.
  Hooking up feed address change nd branching. Also fixing those infernal feed address change bugs for good.
  Finishing up feed_link corrections. Just need feed_address (which is essentially a refactor and abstraction of this feed_link code), and then duplicate UI, which is pretty easy. Yay.
  Refactoring feed rewriting to take advantage of new feed link changer. Seems to work. Still needs some better duplicate locking during fetch.
  Uniqifying address+link hash. Allowing feed_link branches, but it does not yet work. Needs proper dupe detection.
  Beginning new branch feed logic. Needs a huge db migration.
  Swapping titles on feed settings when necessary.
  Swapping rss and website url.
  Stubbing out entire feed settings modal. Needs duplicate feed list. Also needs backend splitting of subscriptions.
  Adding feed setting menu item. Cleaning up feed exception dialog.
Fixing css conflicts in jammit. Adding code rendering to jammit for bookmarklet.
Fixing up jammit branch for launch by adding socket.io, bookmarklet, and compressed static assets. Still needs icons.
Merge branch 'feed_settings' into jammit

* feed_settings:
  Correcting for feeds that have incorrect media content.
  Adding media enclosures in an audio tag.
  Using story date when there is no guid.
  Using story date when there is no guid.
  Adding verbose flag to feed updates to diagnose errors.
  Fixing issue with stories that have no permalink.
Revert "Revert "Switching to requests from urllib2/httplib. Bring on the page errors.""

This reverts commit a827b2c86406f1ed485e24845fada4fa831bf720.
Merge branch 'master' into jammit

* 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
Merge branch 'master' into requests

* master:
  Fixing bogus type error, caused by duplicate feeds.
  Correcting styling on site settings loader icon.
  Removing dupe migration from feed_settings.
  Adding migration for unique hashes on feed addresses + links.
  Counting subscribers on branched feeds correctly, so as to maintain update frequency, even though it's branched.
  Hooking up feed address change nd branching. Also fixing those infernal feed address change bugs for good.
  Finishing up feed_link corrections. Just need feed_address (which is essentially a refactor and abstraction of this feed_link code), and then duplicate UI, which is pretty easy. Yay.
  Refactoring feed rewriting to take advantage of new feed link changer. Seems to work. Still needs some better duplicate locking during fetch.
  Uniqifying address+link hash. Allowing feed_link branches, but it does not yet work. Needs proper dupe detection.
  Beginning new branch feed logic. Needs a huge db migration.
  Swapping titles on feed settings when necessary.
  Swapping rss and website url.
  Stubbing out entire feed settings modal. Needs duplicate feed list. Also needs backend splitting of subscriptions.
  Adding feed setting menu item. Cleaning up feed exception dialog.
Merge branch 'master' into jammit

* master:
  Adding unique index on MStory.
  Quick fix to broken usersubs when changing feed link and address.
  Fixing bone-headed issue around renaming folders and having all child folders also renamed (client-side only).
  All stories in starred stories view now have a score of 1, so they are always displayed.
Merge branch 'master' into jammit

* master: (45 commits)
  Launching the iPhone app on the front-page. Big deal.
  Minor cleanup of river stories view.
  Cleaning up mongoengine imports and settings for default MongoDB.
  Killing off the old slave_db pattern.
  Moving from slave_db to ReplicaSetConnection in pymongo 2.1.
  Adding title and subtitle. (Big thanks to @ericflo for the inspiration.)
  Adding title and subtitle. (Big thanks to @ericflo for the inspiration.)
  Fitting the iphone web page on smaller screens.
  The @jashkenas treatment -- cleaning up the iphone app page.
  Adding rotation to iphone website.
  Using the correct story permalink (if it is not correctly in the link key of the feed).
  Finishign up interaction of iphone app trailer page. Need auto switching.
  iPhone screenshots, iPhone page, complete with animations.
  Adding current version to iPhone app so it can update from the server.
  Removing unnecessary return to selected story on paging of story titles.
  Scrolling the story titles view to the feedbar when a page is loading. Experimental, but may help a bunch of users know what's happening.
  Stubbing in iphone page.
  Solving the Read button dilemma for Everything vs. folders vs. feeds.
  Disabling feed settings button on Everything river view.
  Building folder delete into iOS app.
  ...
Relative to absolute urls for all embedded images.
Merge branch 'master' into requests

* master: (66 commits)
  Too many stories? Don't animate transitions when switching intelligence levels.
  Fixing typo in iphone app that preventing mark folder as read when the visible stories option was showing.
  Updating the mongo db copy util to also look for updated stories.
  Globals.is_staff on user, not profile. Make the stats referesh every minute instead of every 10 minutes for staff.
  Fixing offsets in river of news.
  Adding ciphering to usernames in log, so I can finally take screenshots of the most colorful logs of all time.
  Adding my very special mongo serialization backup utility to get around the damn unrepairable mongo database. This is taking 14 hours to run.
  Auto-refreshing feedback (1 min for staff, 10 min for everybody).
  Fixing exception around multiple feeds during Google Reader import process. Also switching rate limit to status code 429.
  Adding Nokia MeeGo client to user agents.
  Only show raw feeds in feed autocomplete.
  Handling iphone version for new users on ios app.
  FIXING THE WORST BUG OF MY LIFE -- finally figured out what was causing the story-shows-as-unread bug. Also fixed enclosures on certain types of feeds.
  Fixing menu manage open position to compensate for additional menu items.
  Reducing the amount of work done by feed fetching when there are no new stories.
  Fixing emergency bug around trimming feeds where the cursor is changing. Dammit mongo.
  Simplifying ufw ports in fabfile. Adding env.user.
  Launching the iPhone app on the front-page. Big deal.
  Minor cleanup of river stories view.
  Cleaning up mongoengine imports and settings for default MongoDB.
  ...

Conflicts:
	local_settings.py.template
Adding slight bit of color to feed fetcher.
Adding a little bit more leeway in page importer by falling back to urllib2 when requests fail.
Adding urllib fallback to requests in page fetching.
Adding more advanced exception handling for new requests module, with fallback to urllib2.