diff --git a/.eslintrc b/.eslintrc
index 38c2858d..b9137a94 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -17,7 +17,7 @@ rules:
     no-cond-assign: [1, "except-parens"]
     no-debugger: 3
     no-dupe-keys: 3
-    no-eval: 2
+    no-eval: 3
     no-func-assign: 1
     no-invalid-regexp: 1
     no-irregular-whitespace: 3
diff --git a/.gitignore b/.gitignore
index af2db3dc..30a67ac7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ plugins/c9.ide.layout.classic/less/*.css
 plugins/c9.vfs.standalone/www/less.html
 plugins/c9.ide.run/todo
 plugins/c9.vfs.standalone/www/charts
+plugins/c9.ide.language.javascript.tern/util/sigs_ts
 scripts/build
 build/output
 build/standalone/
diff --git a/package.json b/package.json
index 088f9328..c154d10d 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,7 @@
         "send": "~0.1.4",
         "simple-mime": "~0.0.8",
         "tern": "git://github.com/lennartcl/tern.git#97464df789dbb4d81ca4579383a02b320c69563d",
-        "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#b8b3d555e545aa41ed8d0df054ef38416a578faa",
+        "tern_from_ts": "git://github.com/cloud9ide/tern_from_ts.git#6a0107e602b0d044fe1753533cf31f52cf5fb95a",
         "through": "2.2.0",
         "tmp": "~0.0.20",
         "uglify-js": "2.4.16",
@@ -49,17 +49,17 @@
     },
     "licenses": [],
     "c9plugins": {
-        "c9.ide.language": "#854575579b",
+        "c9.ide.language": "#de3c644b88",
         "c9.ide.language.css": "#afda1f867c",
         "c9.ide.language.generic": "#87a4a44671",
         "c9.ide.language.html": "#fa4833e117",
         "c9.ide.language.html.diff": "#a7311cfc9f",
-        "c9.ide.language.javascript": "#26cf518b28",
+        "c9.ide.language.javascript": "#ec9ecf31cf",
         "c9.ide.language.javascript.immediate": "#9a2cce9121",
-        "c9.ide.language.javascript.eslint": "#1baacc275b",
-        "c9.ide.language.javascript.tern": "#a65ad88dd9",
+        "c9.ide.language.javascript.eslint": "#8832423ad1",
+        "c9.ide.language.javascript.tern": "#008c837519",
         "c9.ide.language.javascript.infer": "#ebb2daf81a",
-        "c9.ide.language.jsonalyzer": "#c5dfe5fb7e",
+        "c9.ide.language.jsonalyzer": "#3ae6c1545b",
         "c9.ide.collab": "#b94018ab2b",
         "c9.ide.local": "#2bfd7ff051",
         "c9.ide.find": "#989c06e6a7",
diff --git a/plugins/c9.ide.server/plugins.js b/plugins/c9.ide.server/plugins.js
index ae1f5601..a6132247 100644
--- a/plugins/c9.ide.server/plugins.js
+++ b/plugins/c9.ide.server/plugins.js
@@ -35,6 +35,7 @@ define(function(require, exports, module) {
                 treehugger: "lib/treehugger/lib/treehugger",
                 acorn: "lib/treehugger/lib/treehugger/js",
                 tern: "lib/tern",
+                tern_from_ts: "lib/tern_from_ts",
                 ui: "lib/ui",
                 c9: "lib/c9",
                 frontdoor: "lib/frontdoor",
@@ -56,6 +57,7 @@ define(function(require, exports, module) {
                     "ace_tree", 
                     "acorn",
                     "tern",
+                    "tern_from_ts",
                     "treehugger",
                     "pivottable",
                     "architect",
diff --git a/plugins/c9.ide.watcher/gui.js b/plugins/c9.ide.watcher/gui.js
index 2f14b6ca..a4489de9 100644
--- a/plugins/c9.ide.watcher/gui.js
+++ b/plugins/c9.ide.watcher/gui.js
@@ -330,7 +330,10 @@ define(function(require, exports, module) {
         }
         
         function updateChangedPath(err, path, data) {
-            var doc = changedPaths[path].tab.document;
+            var tab = changedPaths[path].tab || tabManager.findTab(path);
+            if (!tab)
+                return changedPaths[path] && changedPaths[path].resolve();
+            var doc = tab.document;
             doc.setBookmarkedValue(data, true);
             doc.meta.timestamp = Date.now() - settings.timeOffset;
             changedPaths[path].resolve();