Merge remote-tracking branch 'origin/master' into all-ab-testing

package.json

@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.2251",
+    "version": "3.1.2264",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",
@@ -118,6 +118,6 @@
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#a3da59803d",
         "c9.ide.welcome": "#5b86c44e92",
-        "c9.ide.guide": "#8ab966f344"
+        "c9.ide.guide": "#df7c89e449"
     }
 }

scripts/makestatic.js

@@ -82,7 +82,7 @@ function main(config, settings, options, callback) {
                     "cdn.build": {},
                     "db": {
                         "Vfs": {
-                            findAllAndPurge: function(maxVfsAge, callback) {
+                            findAllValidServers: function(maxVfsAge, purgeInvalid, callback) {
                                 callback(null, [{}]);
                             }
                         },