Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur: (60 commits)
  Updating fabfile to account for forked mongoengine + pymongo.
  Updating ipa for the correct ad hoc distribution profile.
  Updating enterprise plist for version 1.7.
  Updating ipa.
  Updating enterprise distribution ipa.
  Fixing a few exceptions.
  Pushing iOS version 1.7.
  Fixing NotUniqueError on read stories by making sure the corret unique index is used.
  Scroll to section header if collapse causes it to scroll far off screen in iOS app.
  Adding read filter and order options to feeds and folders on iOS app.
  Cleaning up RSS feed header for shared stories feeds.
  Adding offsets to unread count fixing.
  Forcing all unread counts to be counted from primary mongo.
  Recount popular authors every 50 new stories.
  Manually counting can now use offsets in case of broken feeds.
  Fixing wonky unread counts.
  Ad hoc provisioning profile for enterprise build for ios app.
  Fixing issue with missing feeds on iOS app.
  Another whack at the enterprise build.
  Moving to wrapped ios download.
  ...
Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur:
  Changing logging colors for social activities.
  Delaying Paypal return, fixing privacy css, and adding convenience function.
  Adding esc shortcut key in keyboard shortcuts. Also turning on privacy features for public beta testing.
  Fixing the missing story titles bug. Turns out it happens when a story title is loaded twice but the reuslting map contains an undefined, which nullifies the rest of the stories. Doh!
  Fixing hostname for Firefox content handler.
  Adding share info to saved stories.
  Revert "Failing marking a story as read in ios now shows an error."
  Failing marking a story as read in ios now shows an error.
  Consistency b/w ios and web for unsaving a story.
  Adding unread counter to All Sites.
  Allowing regular users to change read_filter on socialfeeds.
  Changing icons on welcome page.
  Adding pgsql recovery cronjob.
  Experimental change to story diffing. Adding spaces back in.
  Upgrading iOS version to 1.7.
  Updating carousel to fix broken intro.
  EC2 task servers on fabfile/hosts.
Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur: (99 commits)
  Removing touch callout on classifier training.
  Adding interactivity for tapping authors and tags and updating their classifier inline. Just need to hook them up to the server for persistence, update unread counts, and possibly update stories inline.
  Showing title, tag, and author classifiers by color in story detail on iOS. Long time coming.
  Adding Global Shared Stories to iOS app.
  Fixing disappearing stories bug when using oldest or unread filter, since as a story gets read it no longer counts against the unread count, resulting in an off-by-one per read story bug.
  Fixing issue when loading pages on ios app but loading the story page controller early and not refreshing on page load.
  Upping log colors to only show slow calls.
  Turning on premium expire task.
  Adding task to email expired premiums.
  Feedchooser now shows renewal info. Also adding emaisl for premium expire and premium expire grace period. Just need to send them as tasks and then deactive expired premiums.
  Adding signup/login buttons to bottom of homepage.
  Fixing Firefox Markplace manifest.
  Handling db transactions manually so I don't freeze the db while doing a standard data migration.
  Fixing payment date.
  Handling username changes on payment history.
  Fixing typo on year.
  Calculating payment history for all premium users.
  Keeping payment history uptodate based on signals.
  Showing payment history.
  Adding models for payment history.
  ...
Adding monit for gunicorn + kill gunicorn script for doing the dirty work.