Merge branch 'master' into social

* master:
  Adding necessary import when not running from the REPL.
  Too many stories? Don't animate transitions when switching intelligence levels.

media/js/newsblur/reader.js

@@ -5192,6 +5192,10 @@
             var unread_view_name = options['unread_view_name'] || this.get_unread_view_name();
             var $stories_show, $stories_hide;
             
+            if (this.model.stories.length > 100) {
+                options['animate'] = false;
+            }
+            
             if (this.flags['unread_threshold_temporarily']) {
               unread_view_name = this.flags['unread_threshold_temporarily'];
               options['temporary'] = true;

utils/backups/copy_mongo_serialized.py

@@ -1,18 +1,19 @@
 # Use this script to copy the contents of MongoDB from one server 
 # to another using only pymongo. This circumvents the mongod --repair
-# option, which can fucking fail.
+# option, which can fail.
 
 import sys
 import pymongo
 import datetime
+from apps.rss_feeds.models import Feed
 
 collections = [
-    #"classifier_author",
-    #"classifier_feed",
-    #"classifier_tag",
-    #"classifier_title",
-    #"feed_icons",
-    # "feed_pages",
+    "classifier_author",
+    "classifier_feed",
+    "classifier_tag",
+    "classifier_title",
+    "feed_icons",
+    "feed_pages",
     "feedback",
     "starred_stories",
     "statistics",