diff --git a/configs/client-default.js b/configs/client-default.js
index a9b3d229..372a64ed 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -321,7 +321,82 @@ module.exports = function(options) {
         "plugins/c9.ide.language.javascript/javascript",
         "plugins/c9.ide.language.javascript.immediate/immediate",
         "plugins/c9.ide.language.javascript.infer/jsinfer",
-        "plugins/c9.ide.language.javascript.tern/tern",
+        {
+            packagePath: "plugins/c9.ide.language.javascript.tern/tern",
+            plugins: [
+                {
+                    name: "angular",
+                    path: "tern/plugin/angular",
+                    enabled: true,
+                    hidden: false,
+                },
+                {
+                    name: "doc_comment",
+                    path: "tern/plugin/doc_comment",
+                    enabled: true,
+                    hidden: true,
+                },
+                {
+                    name: "es_modules",
+                    path: "tern/plugin/es_modules",
+                    enabled: true,
+                    hidden: true,
+                },
+                {
+                    name: "modules",
+                    path: "tern/plugin/modules",
+                    enabled: true,
+                    hidden: true,
+                },
+                {
+                    name: "node",
+                    path: "tern/plugin/node",
+                    enabled: true,
+                    hidden: false,
+                },
+                {
+                    name: "requirejs",
+                    path: "tern/plugin/requirejs",
+                    enabled: true,
+                    hidden: false,
+                },
+                {
+                    name: "architect_resolver",
+                    path: "./architect_resolver_worker",
+                    enabled: true,
+                    hidden: true,
+                },
+            ],
+            defs: [{
+                name: "ecma5",
+                enabled: true,
+                experimental: false,
+                firstClass: true,
+                path: "lib/tern/defs/ecma5.json"
+            }, {
+                name: "jQuery",
+                enabled: true,
+                experimental: false,
+                path: "lib/tern/defs/jquery.json"
+            }, {
+                name: "browser",
+                enabled: true,
+                experimental: false,
+                firstClass: true,
+                path: "lib/tern/defs/browser.json"
+            }, {
+                name: "underscore",
+                enabled: false,
+                experimental: false,
+                path: "lib/tern/defs/underscore.json"
+            }, {
+                name: "chai",
+                enabled: false,
+                experimental: false,
+                path: "lib/tern/defs/chai.json"
+            }]
+        },
+        "plugins/c9.ide.language.javascript.tern/ui",
         "plugins/c9.ide.language.javascript.tern/architect_resolver",
         "plugins/c9.ide.language.javascript.eslint/eslint",
         {
diff --git a/package.json b/package.json
index 214620f3..23f45c26 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,8 @@
         "rusha": "~0.7.2",
         "send": "~0.1.4",
         "simple-mime": "~0.0.8",
-        "tern": "git://github.com/cloud9ide/tern.git#749e64a0f0fed91f883ff055df37b4bfc9f2d980",
-        "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#6a0107e602b0d044fe1753533cf31f52cf5fb95a",
+        "tern": "git://github.com/cloud9ide/tern.git#39015d544d4c00c7899fea4c95c2e5bc2720e68e",
+        "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#84d51dcb9b16b126a206789d4d4237cde2801fe4",
         "through": "2.2.0",
         "tmp": "~0.0.20",
         "uglify-js": "2.4.16",
@@ -56,16 +56,16 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#c1cdf70cf0",
+        "c9.ide.language": "#e3be3e2cb9",
         "c9.ide.language.css": "#be07d72209",
-        "c9.ide.language.generic": "#7a1150bc50",
+        "c9.ide.language.generic": "#c8c2ce89e0",
         "c9.ide.language.html": "#9be847c0ce",
         "c9.ide.language.html.diff": "#24f3608d26",
         "c9.ide.language.javascript": "#1a0b1584c2",
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#3127e1eba1",
-        "c9.ide.language.javascript.tern": "#17fb66bef8",
-        "c9.ide.language.javascript.infer": "#c88fc6e405",
+        "c9.ide.language.javascript.tern": "#45e5f5b0e5",
+        "c9.ide.language.javascript.infer": "#d8b693d038",
         "c9.ide.language.jsonalyzer": "#47a64de05d",
         "c9.ide.collab": "#10c224f9b8",
         "c9.ide.local": "#a6e689e33b",
diff --git a/plugins/c9.ide.preferences/experimental.js b/plugins/c9.ide.preferences/experimental.js
index 541deb98..2b348dc8 100644
--- a/plugins/c9.ide.preferences/experimental.js
+++ b/plugins/c9.ide.preferences/experimental.js
@@ -55,8 +55,6 @@ define(function(require, exports, module) {
         
         /***** Methods *****/
         
-        // =0 means the value should be set to 0 to disable otherwise it is enabled
-        // =1 means the value should be set to 1 to enable otherwise it is disabled
         var found = {};
         function addExperiment(name, defaultValue, caption){
             var uniqueId = name.replace(/\//g, "-");
@@ -105,6 +103,7 @@ define(function(require, exports, module) {
         plugin.on("unload", function() {
             loaded = false;
             drawn = false;
+            hasAlerted = false;
             intro = null;
         });
         
diff --git a/plugins/c9.ide.server/views/flat-load-screen.html b/plugins/c9.ide.server/views/flat-load-screen.html
index 533499e4..f59a85e1 100644
--- a/plugins/c9.ide.server/views/flat-load-screen.html
+++ b/plugins/c9.ide.server/views/flat-load-screen.html
@@ -34,7 +34,7 @@
         "Stop cursing, start coding",
         "GET /this/workspace#loaded",
         "Use our Vim mode for extra addictive effect!",
-        "Not your grandfather's IDE",
+        "Not your grandmother's IDE",
         "Now made with 20% more cloud!",
         "Literally makes your laptop cooler",
     ];
diff --git a/server.js b/server.js
index 8c24b8e6..704ea32b 100755
--- a/server.js
+++ b/server.js
@@ -46,7 +46,7 @@ shortcuts.localdev = shortcuts.onlinedev.concat([
 shortcuts.odev = shortcuts.onlinedev; // For backwards compatibility, if you see this in 2016 remove this line
 var delayLoadConfigs = [
     // Services that are usually not immediately needed
-    "preview", "user-content", "api", "apps-proxy", "worker",
+    "preview", "user-content", "apps-proxy", "worker", "homepage",
     // Services that are very slow to load, blocking others
     "profile",
 ];