From 17e979bf3fed455f6a66252f0dde1da603dfb366 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 9 Dec 2015 09:14:54 +0000
Subject: [PATCH 01/87] Show error when html5.js can't be loaded

---
 node_modules/architect/architect.js                 | 10 ++++------
 package.json                                        |  1 +
 plugins/c9.vfs.standalone/views/standalone.html.ejs |  3 +++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/node_modules/architect/architect.js b/node_modules/architect/architect.js
index 59d552b2..de683671 100644
--- a/node_modules/architect/architect.js
+++ b/node_modules/architect/architect.js
@@ -277,11 +277,9 @@ else (function () {
         });
     }
 
-    function resolveConfig(config, base, callback) {
-        if (typeof base == "function") {
-            callback = base;
-            base     = "";
-        }
+    function resolveConfig(config, base, callback, errback) {
+        if (typeof base == "function")
+            return resolveConfig(config, "", arguments[1], arguments[2]);
         
         var paths = [], pluginIndexes = {};
         config.forEach(function (plugin, index) {
@@ -306,7 +304,7 @@ else (function () {
                 plugin.consumes = module.consumes || [];
             });
             callback(null, config);
-        });
+        }, errback);
     }
 }());
 
diff --git a/package.json b/package.json
index 343bb108..6cbc61dc 100644
--- a/package.json
+++ b/package.json
@@ -90,6 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
+        "c9.ide.language.python": "#undefined",
         "c9.ide.mount": "#b9a5a2d45c",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",
diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs
index cc280dc2..7a9e3811 100644
--- a/plugins/c9.vfs.standalone/views/standalone.html.ejs
+++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs
@@ -109,6 +109,9 @@
                     if (window.hideLoader)
                         window.hideLoader();
                 }
+            }, function loadError(mod) {
+                if (mod.id === "plugins/c9.ide.clipboard/html5")
+                    return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?unpacked=1 added to the URL.");
             });
         });
     </script>

From 3580a85cf6e462c23955d0bba6ce05d961387a37 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 9 Dec 2015 12:20:11 +0100
Subject: [PATCH 02/87] Fix message

---
 plugins/c9.vfs.standalone/views/standalone.html.ejs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs
index 7a9e3811..cfdfbe85 100644
--- a/plugins/c9.vfs.standalone/views/standalone.html.ejs
+++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs
@@ -111,9 +111,9 @@
                 }
             }, function loadError(mod) {
                 if (mod.id === "plugins/c9.ide.clipboard/html5")
-                    return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?unpacked=1 added to the URL.");
+                    return alert("Unable to load html5.js.\n\nThis may be caused by a false positive in your virus scanner. Please try reloading with ?packed=1 added to the URL.");
             });
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>

From b8530a7ca539a13047888fbbd8c53003254815ba Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Tue, 29 Dec 2015 21:17:35 +0000
Subject: [PATCH 03/87] Revert "Merge pull request +11315 from c9/fix-tooltip"

This reverts commit b4acf661379fa55f5ef1556b4b65eb7ba67d46cb, reversing
changes made to cc97359c84dfa6a982e34a0da5b2da529a2ec08e.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae96fb30..c6061a9c 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "c9.ide.language.javascript": "#720a876edd",
         "c9.ide.language.javascript.immediate": "#54173370a8",
         "c9.ide.language.javascript.eslint": "#a7d10ddf32",
-        "c9.ide.language.javascript.tern": "#2d9cb639ed",
+        "c9.ide.language.javascript.tern": "#726fccb636",
         "c9.ide.language.javascript.infer": "#5036f68fe6",
         "c9.ide.language.jsonalyzer": "#794b694ef6",
         "c9.ide.collab": "#30efed939e",

From f3ee816332e096d8761d2cb80627c567bb4aacc7 Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Tue, 29 Dec 2015 21:17:56 +0000
Subject: [PATCH 04/87] Revert "Merge pull request +11317 from
 c9/fix-another-regression"

This reverts commit ccedef28875d6e5b5a60304b100575120fee2dca, reversing
changes made to f2240fda9eee08da4653b3da2e98dd0ab53c2e0a.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c6061a9c..bb1e39b9 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#46c4069e72",
+        "c9.ide.language.python": "#fe115968eb",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 42942eb6610600066c7cab8d95ab20fcd95ef3a0 Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Tue, 29 Dec 2015 21:18:43 +0000
Subject: [PATCH 05/87] Revert "Merge pull request +11282 from
 c9/refactor-language"

This reverts commit 0100d3b550fd687693e09216d3a8bcdf1068001b, reversing
changes made to cc68450f46a742c289fb7bf83d2622fb6cc23a0b.

Conflicts:
	npm-shrinkwrap.json
---
 package.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index bb1e39b9..d663afff 100644
--- a/package.json
+++ b/package.json
@@ -55,17 +55,17 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#bf7c02e381",
-        "c9.ide.language.css": "#8a77f72326",
-        "c9.ide.language.generic": "#378d8a2127",
-        "c9.ide.language.html": "#d831388dd2",
+        "c9.ide.language": "#1671c714ba",
+        "c9.ide.language.css": "#36150db526",
+        "c9.ide.language.generic": "#365368d108",
+        "c9.ide.language.html": "#e7b5ab7ff8",
         "c9.ide.language.html.diff": "#24f3608d26",
-        "c9.ide.language.javascript": "#720a876edd",
-        "c9.ide.language.javascript.immediate": "#54173370a8",
-        "c9.ide.language.javascript.eslint": "#a7d10ddf32",
-        "c9.ide.language.javascript.tern": "#726fccb636",
-        "c9.ide.language.javascript.infer": "#5036f68fe6",
-        "c9.ide.language.jsonalyzer": "#794b694ef6",
+        "c9.ide.language.javascript": "#1fd30cdf38",
+        "c9.ide.language.javascript.immediate": "#3e4f50e694",
+        "c9.ide.language.javascript.eslint": "#b3a4891ca7",
+        "c9.ide.language.javascript.tern": "#a70b174dd2",
+        "c9.ide.language.javascript.infer": "#8d2f248e33",
+        "c9.ide.language.jsonalyzer": "#f94698abff",
         "c9.ide.collab": "#30efed939e",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#fe115968eb",
+        "c9.ide.language.python": "#c4e6cffc0f",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 741e9d5a43a34225ace031c6b0a3ed44a10b2718 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 08:45:24 +0000
Subject: [PATCH 06/87] Clean up event emitting

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae96fb30..5bc3f1c7 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#46c4069e72",
+        "c9.ide.language.python": "#527faffc7c",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 704a7c174fe3bffaa9f2781dcaae70f0f7879705 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 08:46:57 +0000
Subject: [PATCH 07/87] Default cwd to workspaceDir

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5bc3f1c7..5a1a47b1 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#bf7c02e381",
+        "c9.ide.language": "#25f5e068ed",
         "c9.ide.language.css": "#8a77f72326",
         "c9.ide.language.generic": "#378d8a2127",
         "c9.ide.language.html": "#d831388dd2",

From 10f6f62edbb43ec0b2c97894826b0718dbc61748 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 09:15:22 +0000
Subject: [PATCH 08/87] Fix Python 3 support

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5a1a47b1..b3a4f25c 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#527faffc7c",
+        "c9.ide.language.python": "#e17dae1e2c",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 9f5de3665d00815c611385dbd31b8d55a618d1dd Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 09:37:35 +0000
Subject: [PATCH 09/87] Fix linting only happening when completion is enabled

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b3a4f25c..64e4d201 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#e17dae1e2c",
+        "c9.ide.language.python": "#e9e521d975",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From af360630b3e5ca1af6cac6f5d1715c813096e742 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 12:04:48 +0100
Subject: [PATCH 10/87] c9-auto-bump 3.1.865

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae96fb30..ff73c575 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.864",
+    "version": "3.1.865",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ec8770402afc0a8b2298f1f5615e7cff1634f7b6 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 11:15:32 +0000
Subject: [PATCH 11/87] Add PYTHONPATH setting for completion

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 64e4d201..055bd8f0 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#e9e521d975",
+        "c9.ide.language.python": "#b82cd8a170",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 3937ef404551ba424c1741e71991e9c4785f7a81 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 13:13:13 +0100
Subject: [PATCH 12/87] c9-auto-bump 3.1.866

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ff73c575..e75ea408 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.865",
+    "version": "3.1.866",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From beeae5ce3ca1b399bbee31c05c661ade900fd761 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 12:41:18 +0000
Subject: [PATCH 13/87] Move setting to config

---
 configs/client-default.js | 5 ++++-
 package.json              | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configs/client-default.js b/configs/client-default.js
index 2462bd1b..5e52d5d2 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -324,7 +324,10 @@ module.exports = function(options) {
         "plugins/c9.ide.language.javascript.tern/tern",
         "plugins/c9.ide.language.javascript.tern/architect_resolver",
         "plugins/c9.ide.language.javascript.eslint/eslint",
-        "plugins/c9.ide.language.python/python",
+        {
+            packagePath: "plugins/c9.ide.language.python/python",
+            pythonPath:  "/usr/local/lib/python2.7/dist-packages:/usr/local/lib/python3.4/dist-packages",
+        },
         {
             packagePath: "plugins/c9.ide.language.jsonalyzer/jsonalyzer",
             extendToken: extendToken,
diff --git a/package.json b/package.json
index 055bd8f0..7b5d5e79 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#b82cd8a170",
+        "c9.ide.language.python": "#1a97c15fdc",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From e672832f25635a66d08f8d8cb48822bd0fe8fc7b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 14:18:49 +0100
Subject: [PATCH 14/87] c9-auto-bump 3.1.867

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 38c807a8..1b7e4f5e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.866",
+    "version": "3.1.867",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 8b40c08645c354d7fc976b211273fb4eb80bda34 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 14:28:45 +0100
Subject: [PATCH 15/87] c9-auto-bump 3.1.868

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7042fb41..7ed6663e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.867",
+    "version": "3.1.868",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b22bb289985569f93472953ab38e428249a91476 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 14:31:08 +0100
Subject: [PATCH 16/87] c9-auto-bump 3.1.869

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7ed6663e..65c3e99e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.868",
+    "version": "3.1.869",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 42bf38e305b662cc248c9d04c367afc5aa7401dd Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 14:44:10 +0100
Subject: [PATCH 17/87] c9-auto-bump 3.1.870

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 65c3e99e..ba701a79 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.869",
+    "version": "3.1.870",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ae562d2841ff8991318c53b9a7a13c2c70b56779 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 16:27:57 +0100
Subject: [PATCH 18/87] c9-auto-bump 3.1.871

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ba701a79..59dd5e49 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.870",
+    "version": "3.1.871",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 687d5838b2b67992426ced81cc2f2a4e299000da Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 17:03:13 +0100
Subject: [PATCH 19/87] c9-auto-bump 3.1.872

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 59dd5e49..8b1892e8 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.871",
+    "version": "3.1.872",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f5fe64d1f2b83f42ba6bfcedc35177d4757bf207 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 29 Dec 2015 14:34:21 +0400
Subject: [PATCH 20/87] fix matching bracket highlighting in js templates

---
 .../lib/ace/mode/_test/text_javascript.txt    |  5 +++
 .../lib/ace/mode/_test/tokens_javascript.json | 42 ++++++++++++++++++-
 .../ace/mode/javascript_highlight_rules.js    |  3 +-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt
index e91c5c60..d65f3fb4 100644
--- a/node_modules/ace/lib/ace/mode/_test/text_javascript.txt
+++ b/node_modules/ace/lib/ace/mode/_test/text_javascript.txt
@@ -93,3 +93,8 @@ z=<div {...this.props} x={1 + 2} y="z{a}b&amp;" t={
 1 <a> { ++x  } </a>
 </div>
 
+var o = {
+    t:`${[].map(x => {
+        return x
+    })}`
+};
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json
index 29098f5a..388c2639 100644
--- a/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json
+++ b/node_modules/ace/lib/ace/mode/_test/tokens_javascript.json
@@ -686,5 +686,45 @@
 ],[
    "start"
 ],[
-   "start"
+   "start",
+  ["storage.type","var"],
+  ["text"," "],
+  ["identifier","o"],
+  ["text"," "],
+  ["keyword.operator","="],
+  ["text"," "],
+  ["paren.lparen","{"]
+],[
+   ["start","no_regex","start","string.quasi.start","string.quasi.start","no_regex"],
+  ["text","    "],
+  ["identifier","t"],
+  ["punctuation.operator",":"],
+  ["string.quasi.start","`"],
+  ["paren.quasi.start","${"],
+  ["paren.lparen","["],
+  ["paren.rparen","]"],
+  ["punctuation.operator","."],
+  ["identifier","map"],
+  ["paren.lparen","("],
+  ["identifier","x"],
+  ["text"," "],
+  ["keyword.operator","=>"],
+  ["text"," "],
+  ["paren.lparen","{"]
+],[
+   ["#tmp","no_regex","start","no_regex","start","string.quasi.start","string.quasi.start","no_regex"],
+  ["text","        "],
+  ["keyword","return"],
+  ["text"," "],
+  ["identifier","x"]
+],[
+   "no_regex",
+  ["text","    "],
+  ["paren.rparen","})"],
+  ["paren.quasi.end","}"],
+  ["string.quasi.end","`"]
+],[
+   "start",
+  ["paren.rparen","}"],
+  ["punctuation.operator",";"]
 ]]
\ No newline at end of file
diff --git a/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js b/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js
index 86855f9c..9aa86966 100644
--- a/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js
+++ b/node_modules/ace/lib/ace/mode/javascript_highlight_rules.js
@@ -354,9 +354,8 @@ var JavaScriptHighlightRules = function(options) {
                 this.next = val == "{" ? this.nextState : "";
                 if (val == "{" && stack.length) {
                     stack.unshift("start", state);
-                    return "paren";
                 }
-                if (val == "}" && stack.length) {
+                else if (val == "}" && stack.length) {
                     stack.shift();
                     this.next = stack.shift();
                     if (this.next.indexOf("string") != -1 || this.next.indexOf("jsx") != -1)

From f0aca9fe2a052296cb88f656a03bfb520e41e1b2 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 24 Dec 2015 02:38:42 +0400
Subject: [PATCH 21/87] reset scrollbar position when changing session

---
 node_modules/ace/lib/ace/virtual_renderer.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/node_modules/ace/lib/ace/virtual_renderer.js b/node_modules/ace/lib/ace/virtual_renderer.js
index a221d46c..a87b7860 100644
--- a/node_modules/ace/lib/ace/virtual_renderer.js
+++ b/node_modules/ace/lib/ace/virtual_renderer.js
@@ -245,6 +245,7 @@ var VirtualRenderer = function(container, theme) {
         
         this.$loop.schedule(this.CHANGE_FULL);
         // this.session.$setFontMetrics(this.$fontMetrics);
+        this.scrollBarV.scrollLeft = this.scrollBarV.scrollTop = null;
         
         this.onChangeNewLineMode = this.onChangeNewLineMode.bind(this);
         this.onChangeNewLineMode()

From a53be54f563a7d5147fc930a914a5e5ad450bc6d Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 29 Dec 2015 16:00:27 +0400
Subject: [PATCH 22/87] fix raygun error trying to clone Date

---
 node_modules/ace/lib/ace/lib/lang.js | 10 ++++------
 plugins/c9.fs/fs.cache.xml.js        | 12 ++++++++++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/node_modules/ace/lib/ace/lib/lang.js b/node_modules/ace/lib/ace/lib/lang.js
index f306e3e4..ab3d4d51 100644
--- a/node_modules/ace/lib/ace/lib/lang.js
+++ b/node_modules/ace/lib/ace/lib/lang.js
@@ -74,7 +74,7 @@ exports.copyArray = function(array){
     var copy = [];
     for (var i=0, l=array.length; i<l; i++) {
         if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
+            copy[i] = this.copyObject(array[i]);
         else 
             copy[i] = array[i];
     }
@@ -92,14 +92,12 @@ exports.deepCopy = function deepCopy(obj) {
         }
         return copy;
     }
-    var cons = obj.constructor;
-    if (cons === RegExp)
+    if (Object.prototype.toString.call(obj) !== "[object Object]")
         return obj;
     
-    copy = cons();
-    for (var key in obj) {
+    copy = {};
+    for (var key in obj)
         copy[key] = deepCopy(obj[key]);
-    }
     return copy;
 };
 
diff --git a/plugins/c9.fs/fs.cache.xml.js b/plugins/c9.fs/fs.cache.xml.js
index 9d2a6c6d..9d0babbe 100644
--- a/plugins/c9.fs/fs.cache.xml.js
+++ b/plugins/c9.fs/fs.cache.xml.js
@@ -629,6 +629,14 @@ define(function(require, exports, module) {
                     });
                 } else if (key === "children" || key === "isSelected") {
                     prop = null;
+                } else if (Object.prototype.toString.call(node[key]) == "[object Date]") {
+                    // why Date ends up here?
+                    reportError(new Error("Date in fs cache"), {
+                        key: key,
+                        value: node[key],
+                        path: node.path,
+                        hasParentProp: !!node.parent,
+                    });
                 } else {
                     prop = lang.deepCopy(node[key]);
                 }
@@ -637,9 +645,9 @@ define(function(require, exports, module) {
             return copy;
         }
         
-        function clear(){
+        function clear() {
             var all = model.visibleItems;
-            for (var i = all.length; i--; ) {
+            for (var i = all.length; i--;) {
                 if (model.isOpen(all[i]))
                     model.collapse(all[i]);
             }

From dad031d18b1b36be5a3348e7fcc4e2864d5d5181 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 29 Dec 2015 23:09:34 +0400
Subject: [PATCH 23/87] fix collab not connecting for files opened by show
 active file

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8b1892e8..42a32d16 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
         "c9.ide.language.javascript.tern": "#a70b174dd2",
         "c9.ide.language.javascript.infer": "#8d2f248e33",
         "c9.ide.language.jsonalyzer": "#f94698abff",
-        "c9.ide.collab": "#30efed939e",
+        "c9.ide.collab": "#10c224f9b8",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
         "c9.ide.find.infiles": "#c3bf17286d",

From 90ba04ed7626eba3e964c05aaae1d6776bb2011c Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Wed, 30 Dec 2015 17:46:50 +0100
Subject: [PATCH 24/87] Revert "Revert base_handler refactoring"

---
 package.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index 8b1892e8..b1f7952c 100644
--- a/package.json
+++ b/package.json
@@ -55,17 +55,17 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a279b3826f",
-        "c9.ide.language.css": "#36150db526",
-        "c9.ide.language.generic": "#365368d108",
-        "c9.ide.language.html": "#e7b5ab7ff8",
+        "c9.ide.language": "#cf6efd83d1",
+        "c9.ide.language.css": "#be07d72209",
+        "c9.ide.language.generic": "#2b5cc6275e",
+        "c9.ide.language.html": "#9be847c0ce",
         "c9.ide.language.html.diff": "#24f3608d26",
-        "c9.ide.language.javascript": "#1fd30cdf38",
-        "c9.ide.language.javascript.immediate": "#3e4f50e694",
-        "c9.ide.language.javascript.eslint": "#b3a4891ca7",
-        "c9.ide.language.javascript.tern": "#a70b174dd2",
-        "c9.ide.language.javascript.infer": "#8d2f248e33",
-        "c9.ide.language.jsonalyzer": "#f94698abff",
+        "c9.ide.language.javascript": "#1a0b1584c2",
+        "c9.ide.language.javascript.immediate": "#c8b1e5767a",
+        "c9.ide.language.javascript.eslint": "#586becb51d",
+        "c9.ide.language.javascript.tern": "#b03b4dc50b",
+        "c9.ide.language.javascript.infer": "#001fe08ecb",
+        "c9.ide.language.jsonalyzer": "#f3c2f606f8",
         "c9.ide.collab": "#30efed939e",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#e0deed4000",
+        "c9.ide.language.python": "#6fe0137f39",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 3da57b80122509490fc83a3d94c81e3f73fef3b5 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Tue, 29 Dec 2015 22:57:10 +0400
Subject: [PATCH 25/87] fix another regression after language handler refactor

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b1f7952c..7b9daad3 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#cf6efd83d1",
+        "c9.ide.language": "#a411bd0986",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#2b5cc6275e",
         "c9.ide.language.html": "#9be847c0ce",

From 00998f58c28045da6aa1967adb11e0671aa5ab68 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Wed, 30 Dec 2015 19:55:30 +0100
Subject: [PATCH 26/87] c9-auto-bump 3.1.873

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8b1892e8..05e9ab24 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.872",
+    "version": "3.1.873",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f837637efa5aec67d5f01f5608aea1fbc192565a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 31 Dec 2015 09:23:06 +0100
Subject: [PATCH 27/87] c9-auto-bump 3.1.874

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05e9ab24..f28f4c1b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.873",
+    "version": "3.1.874",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 210a2032e0f447b17081e01f340d9b2b4dbbb2b8 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 10:38:36 +0000
Subject: [PATCH 28/87] Improve PYTHONPATH handling

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f28f4c1b..a414ce32 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
         "c9.ide.language.javascript.eslint": "#b3a4891ca7",
         "c9.ide.language.javascript.tern": "#a70b174dd2",
         "c9.ide.language.javascript.infer": "#8d2f248e33",
-        "c9.ide.language.jsonalyzer": "#f94698abff",
+        "c9.ide.language.jsonalyzer": "#2ebf2b73d6",
         "c9.ide.collab": "#30efed939e",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#e0deed4000",
+        "c9.ide.language.python": "#31e57cb10b",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From f068de771f5756422408754a0a1d563784a66f5a Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 10:38:45 +0000
Subject: [PATCH 29/87] Support PYTHONPATH for linter

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a414ce32..dcbf7431 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#31e57cb10b",
+        "c9.ide.language.python": "#56279528b8",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 2c3afc367ec683ae1bf20bc1d9827639a88c9cd9 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 10:45:48 +0000
Subject: [PATCH 30/87] Use PYTHONPATH setting for runners

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index dcbf7431..2a8ebc60 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#56279528b8",
+        "c9.ide.language.python": "#ed39fb324b",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",
@@ -103,7 +103,7 @@
         "c9.ide.recentfiles": "#7c099abf40",
         "c9.ide.remote": "#301d2ab519",
         "c9.ide.processlist": "#2b12cd1bdd",
-        "c9.ide.run": "#d37ffe17d5",
+        "c9.ide.run": "#e449c6c0f8",
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#70aeb327c0",
         "c9.ide.save": "#9461acd953",

From 97b2b488e3e95923d4528c5d357a0dbe8fe16761 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 31 Dec 2015 11:52:19 +0100
Subject: [PATCH 31/87] c9-auto-bump 3.1.875

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2a8ebc60..cc1b16e3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.874",
+    "version": "3.1.875",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 23b5c9b75d4b339671bf098f356e03f7e6a366a8 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 31 Dec 2015 11:56:03 +0100
Subject: [PATCH 32/87] c9-auto-bump 3.1.876

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cc1b16e3..2bfc801d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.875",
+    "version": "3.1.876",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f42dcf1a314c4b2cca292634caf4b270f782933a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 31 Dec 2015 11:57:04 +0100
Subject: [PATCH 33/87] c9-auto-bump 3.1.877

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 273113a4..60a2db24 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.876",
+    "version": "3.1.877",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 41e365cd12181faa533adae3c65809ebc36364af Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Tue, 29 Dec 2015 15:20:56 +0000
Subject: [PATCH 34/87] Fix err serialization

(passing as normal argument wouldn't get it properly serialized, stripping .message and .stack)
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 60a2db24..3b777bb7 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
         "c9.ide.language.javascript.eslint": "#b3a4891ca7",
         "c9.ide.language.javascript.tern": "#a70b174dd2",
         "c9.ide.language.javascript.infer": "#8d2f248e33",
-        "c9.ide.language.jsonalyzer": "#2ebf2b73d6",
+        "c9.ide.language.jsonalyzer": "#7f49ff2785",
         "c9.ide.collab": "#10c224f9b8",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",

From 773ddde159cea9121d615fce62b57e4cfb76127e Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 12:59:25 +0000
Subject: [PATCH 35/87] Fix error propagation

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3b777bb7..43842517 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a279b3826f",
+        "c9.ide.language": "#a09c17c3ce",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",
@@ -65,7 +65,7 @@
         "c9.ide.language.javascript.eslint": "#b3a4891ca7",
         "c9.ide.language.javascript.tern": "#a70b174dd2",
         "c9.ide.language.javascript.infer": "#8d2f248e33",
-        "c9.ide.language.jsonalyzer": "#7f49ff2785",
+        "c9.ide.language.jsonalyzer": "#92237b475a",
         "c9.ide.collab": "#10c224f9b8",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",

From 30878e4719d44385d57b4510276d23f69bbae46d Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 12:59:34 +0000
Subject: [PATCH 36/87] Fix cwd for files in workspace root

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 43842517..a35b5173 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#ed39fb324b",
+        "c9.ide.language.python": "#eba0ea01e1",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From d1e18d17a1f6e95d1001463682cc07bbe1f49f00 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 13:41:04 +0000
Subject: [PATCH 37/87] Improve default cwd

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index a35b5173..dae74820 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a09c17c3ce",
+        "c9.ide.language": "#b523db804f",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#eba0ea01e1",
+        "c9.ide.language.python": "#10498750c5",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 6d94e82f7d02a91524244cb18e1035ec9ed120a4 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 13:54:49 +0000
Subject: [PATCH 38/87] Improve docHtml support

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dae74820..0108599f 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#b523db804f",
+        "c9.ide.language": "#8d56ee72c5",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From 5f140ae88bf9c094da656f58b02ff3fb10b58806 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 13:55:26 +0000
Subject: [PATCH 39/87] Be less picky with guessTooltip()

e.g. show tooltip for Python classes like

    from django.http import HttpResponse

    HttpResponse(
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0108599f..7cd86ffb 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#8d56ee72c5",
+        "c9.ide.language": "#e2fab5d5fa",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From b12d5d4f3f6102de4d2d271566d9970b0bd772c6 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 14:04:15 +0000
Subject: [PATCH 40/87] Hack away some self parameters

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7cd86ffb..1a61f6a9 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
         "c9.ide.imgeditor": "#612e75ef4f",
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
-        "c9.ide.language.python": "#10498750c5",
+        "c9.ide.language.python": "#8c7fb7e7a3",
         "c9.ide.mount": "#befb8188d5",
         "c9.ide.navigate": "#38ae100ea1",
         "c9.ide.newresource": "#981a408a7b",

From 4fad4752214192de635234ed742033b969c5f8e7 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 14:24:40 +0000
Subject: [PATCH 41/87] Fix regex

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1a61f6a9..65324e14 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#e2fab5d5fa",
+        "c9.ide.language": "#edaf50452c",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",
@@ -65,7 +65,7 @@
         "c9.ide.language.javascript.eslint": "#b3a4891ca7",
         "c9.ide.language.javascript.tern": "#a70b174dd2",
         "c9.ide.language.javascript.infer": "#8d2f248e33",
-        "c9.ide.language.jsonalyzer": "#92237b475a",
+        "c9.ide.language.jsonalyzer": "#8a4d7987be",
         "c9.ide.collab": "#10c224f9b8",
         "c9.ide.local": "#a6e689e33b",
         "c9.ide.find": "#e33fbaed2f",

From 7b5d31693cf0704901d933efa01b8c6ae4673fda Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Thu, 31 Dec 2015 18:41:33 +0400
Subject: [PATCH 42/87] it is easy to accidentally type shift-backspace instead
 of backspace

---
 plugins/c9.ide.terminal/aceterm/input.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/c9.ide.terminal/aceterm/input.js b/plugins/c9.ide.terminal/aceterm/input.js
index cee51cdc..2fb3e2bc 100644
--- a/plugins/c9.ide.terminal/aceterm/input.js
+++ b/plugins/c9.ide.terminal/aceterm/input.js
@@ -68,10 +68,10 @@ define(function(require, exports, module) {
             bindKey: {win: "Ctrl-Delete", mac: "Option-Delete"},
             name: "\u001bd" // "alt-d"
         }, {
-            bindKey: {win: "Alt-Backspace|Shift-Backspace", mac: "Ctrl-Backspace|Shift-Backspace"},
+            bindKey: {win: "Alt-Backspace", mac: "Ctrl-Backspace"},
             name: "\u0015" // "ctrl-u"
         }, {
-            bindKey: {win: "Alt-Delete|Shift-Delete", mac: "Ctrl-Delete|Shift-Delete"},
+            bindKey: {win: "Alt-Delete", mac: "Ctrl-Delete"},
             name: "\u000b" // "ctrl-k"
         }, {
             bindKey: {win: "Ctrl-z", mac: "Cmd-z"},

From 67e9fa2b83070ac060259a87c3a7c81125f90c6a Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Thu, 31 Dec 2015 16:06:34 +0100
Subject: [PATCH 43/87] Remove unnecessary escape

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 65324e14..705fbbd2 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#edaf50452c",
+        "c9.ide.language": "#4d077709db",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From eaca2c3e59cf328ab9d4235a3c3175c7416f6e32 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Thu, 31 Dec 2015 17:37:05 +0100
Subject: [PATCH 44/87] c9-auto-bump 3.1.878

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 60a2db24..3f9cdf97 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.877",
+    "version": "3.1.878",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 52f0be27f465dd3e06e75f1c3969b1ddb39bf43d Mon Sep 17 00:00:00 2001
From: Lennart kats <lennart@c9.io>
Date: Fri, 1 Jan 2016 22:32:04 +0000
Subject: [PATCH 45/87] Fix +11325 worker not getting latest document from UI

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f9cdf97..0415544b 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a279b3826f",
+        "c9.ide.language": "#167937d765",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From 30fc0f237d0b33305cd42cf4cc5945f5577651a3 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 2 Jan 2016 13:48:38 +0000
Subject: [PATCH 46/87] Fix original line value

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0415544b..4ee7a2af 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#167937d765",
+        "c9.ide.language": "#a8513bc439",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From bb424c2272d2b9d71ddad0232089ced2dd6d6fbc Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 2 Jan 2016 15:25:28 +0100
Subject: [PATCH 47/87] Fix language plugin unload

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4ee7a2af..54f50205 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#a8513bc439",
+        "c9.ide.language": "#aded85767c",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From e63a709c5264040482128f5e917430bcf64f53d5 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 2 Jan 2016 14:29:08 +0000
Subject: [PATCH 48/87] Fix escape issues

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 705fbbd2..fd1e42f1 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#4d077709db",
+        "c9.ide.language": "#205411926b",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From 729d2fdf934824eecb2050476dd03c47aadb1cd2 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sat, 2 Jan 2016 15:45:12 +0100
Subject: [PATCH 49/87] worker.$doc may not be ready yet

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 54f50205..00725a4d 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#aded85767c",
+        "c9.ide.language": "#65c9339c1d",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From d188297c006976e32b55fff33f33e492d8484bbc Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:25:51 +0100
Subject: [PATCH 50/87] Fix typo

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd1e42f1..22e2ebe8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#205411926b",
+        "c9.ide.language": "#61f92eba52",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From 3a45dba9e81486e2364480cc406224727266335e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sun, 3 Jan 2016 21:50:06 +0100
Subject: [PATCH 51/87] c9-auto-bump 3.1.879

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f9cdf97..5919557f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.878",
+    "version": "3.1.879",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 0690d2f860b8e5b75d8f4efaf804a44a76a7f28f Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Sun, 3 Jan 2016 22:44:24 +0100
Subject: [PATCH 52/87] c9-auto-bump 3.1.880

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5919557f..f04a52a3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.879",
+    "version": "3.1.880",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From dd62eea635ea99dbd6bcaae33e55b28d5c14cf1b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:35:38 +0100
Subject: [PATCH 53/87] c9-auto-bump 3.1.881

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f04a52a3..9caf05ba 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.880",
+    "version": "3.1.881",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 646a54ccd55e3ae26881a8f07baf55e028c4ee7a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:36:53 +0100
Subject: [PATCH 54/87] c9-auto-bump 3.1.882

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9caf05ba..721c72bd 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.881",
+    "version": "3.1.882",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From cb95846438a60d0f00f76ed770e54882532b6d45 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Mon, 4 Jan 2016 09:38:46 +0100
Subject: [PATCH 55/87] Remove plugin argument from Ace listeners

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 00725a4d..94566997 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#65c9339c1d",
+        "c9.ide.language": "#a027ffa8d6",
         "c9.ide.language.css": "#36150db526",
         "c9.ide.language.generic": "#365368d108",
         "c9.ide.language.html": "#e7b5ab7ff8",

From 5e52296da6fe2a25c7422d3842ea87f4f7cf1baf Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:39:51 +0100
Subject: [PATCH 56/87] c9-auto-bump 3.1.883

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 721c72bd..84e19332 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.882",
+    "version": "3.1.883",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 47c6c2b84ef587ffb4778322c08ad61b1a469ac3 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:40:19 +0100
Subject: [PATCH 57/87] c9-auto-bump 3.1.884

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index f0bfe527..2a8b2078 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.883",
+    "version": "3.1.884",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d2b2c038aefea3fe6649aa89b80e19193cdfcfe6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:42:56 +0100
Subject: [PATCH 58/87] c9-auto-bump 3.1.885

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4335e5d8..0b40bd84 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.884",
+    "version": "3.1.885",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From c14e96d69d951a9102a989374b7ffa03a4ec5648 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:43:09 +0100
Subject: [PATCH 59/87] c9-auto-bump 3.1.886

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0b40bd84..bb272186 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.885",
+    "version": "3.1.886",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From d7e650f91e017249d06203508a517691b8b60d5c Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 09:46:45 +0100
Subject: [PATCH 60/87] c9-auto-bump 3.1.887

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index add82e13..dc6f37e2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.886",
+    "version": "3.1.887",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ce435a88d85761b442621c86334aa5b3b2f7d2dc Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 10:04:20 +0100
Subject: [PATCH 61/87] c9-auto-bump 3.1.888

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dc6f37e2..095a09cc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.887",
+    "version": "3.1.888",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f99eae0a4fa7085b17556cea55be4e3a3ef28b93 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 10:11:39 +0100
Subject: [PATCH 62/87] c9-auto-bump 3.1.889

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 095a09cc..d9bd9e03 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.888",
+    "version": "3.1.889",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7756b34fd5dfb1dc8491688a491a6cb66b8fabcc Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:02:15 +0100
Subject: [PATCH 63/87] Backport 'console' completion fix from
 language-library-ui branch

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d9bd9e03..fe583b1d 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,7 @@
         "c9.ide.language.javascript": "#1a0b1584c2",
         "c9.ide.language.javascript.immediate": "#c8b1e5767a",
         "c9.ide.language.javascript.eslint": "#586becb51d",
-        "c9.ide.language.javascript.tern": "#b03b4dc50b",
+        "c9.ide.language.javascript.tern": "#f9ba3813d7",
         "c9.ide.language.javascript.infer": "#001fe08ecb",
         "c9.ide.language.jsonalyzer": "#1454bd1ed7",
         "c9.ide.collab": "#10c224f9b8",

From 034d78aeb8da7bbe33e671ba692e0404ce4cd322 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:04:46 +0100
Subject: [PATCH 64/87] Fix uncontextual early predictions

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fe583b1d..98f766d7 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#9374163ea5",
+        "c9.ide.language": "#baff0204f2",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#2b5cc6275e",
         "c9.ide.language.html": "#9be847c0ce",

From 5f9de12c30f40070193975e87a91a3349b228556 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 13:57:00 +0100
Subject: [PATCH 65/87] Fix --helpWithSudo

---
 server.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server.js b/server.js
index 2ecaed27..a64ebe82 100755
--- a/server.js
+++ b/server.js
@@ -84,6 +84,7 @@ function main(argv, config, onLoaded) {
         .describe("domains", "Primary and any secondary top-level domains to use (e.g, c9.io,c9.dev)")
         .describe("exclude", "Exclude specified service")
         .describe("include", "Include only specified service")
+        .describe("helpWithSudo", "Ask for sudo password on startup")
         .default("domains", inContainer && process.env.C9_HOSTNAME || process.env.C9_DOMAINS)
         .boolean("help")
         .describe("help", "Show command line options.");
@@ -107,7 +108,7 @@ function main(argv, config, onLoaded) {
     var delayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) !== -1 });
     var notDelayed = expanded.filter(function(c) { return delayLoadConfigs.indexOf(c) === -1 });
     
-    if (options.helpWithSudo)
+    if (options.argv.helpWithSudo)
         return child_process.execFile("sudo", ["echo -n"], main.bind(null, argv.filter(function(a) {
             return a !== "--helpWithSudo";
         }), config, onLoaded));

From 33cd4df8a3f489e9caf64b0ba8deba924505a197 Mon Sep 17 00:00:00 2001
From: Lennart Kats <lclkats@gmail.com>
Date: Sun, 3 Jan 2016 14:06:06 +0100
Subject: [PATCH 66/87] Fix preferred completion handling w/caching

Conflicts, added tests removed for now:
	plugins/c9.ide.language/language_test.js
---
 package.json | 2 +-
 server.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 98f766d7..bfb8fc53 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
         "c9"
     ],
     "c9plugins": {
-        "c9.ide.language": "#baff0204f2",
+        "c9.ide.language": "#630462418b",
         "c9.ide.language.css": "#be07d72209",
         "c9.ide.language.generic": "#2b5cc6275e",
         "c9.ide.language.html": "#9be847c0ce",
diff --git a/server.js b/server.js
index a64ebe82..f04bc837 100755
--- a/server.js
+++ b/server.js
@@ -205,4 +205,4 @@ function start(configName, options, callback) {
                 plugin.name = name; 
         });
     });
-}
\ No newline at end of file
+}

From 9b9668e10c2c817825f0165202c37067ddce5c7b Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 11:33:05 +0100
Subject: [PATCH 67/87] c9-auto-bump 3.1.890

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d9bd9e03..9490601a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.889",
+    "version": "3.1.890",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 34e533ab5f881c7e68b5fd9853cbad52862cb60e Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 11:39:55 +0100
Subject: [PATCH 68/87] c9-auto-bump 3.1.891

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9490601a..cbb94a4e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.890",
+    "version": "3.1.891",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3af7e6140ca3466f4cef4c7023b9195346be93b1 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 11:49:07 +0100
Subject: [PATCH 69/87] c9-auto-bump 3.1.892

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cbb94a4e..95dab189 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.891",
+    "version": "3.1.892",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 095bf14bcace56171a6412e6ed9d837a4c1213fd Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 12:24:26 +0100
Subject: [PATCH 70/87] c9-auto-bump 3.1.893

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 95dab189..34fe98a2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.892",
+    "version": "3.1.893",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From f8e8ea142c31b032c8d76a572980eacf1dfa070a Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 14:14:05 +0100
Subject: [PATCH 71/87] c9-auto-bump 3.1.894

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 34fe98a2..d9ba808d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.893",
+    "version": "3.1.894",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 1388058889b1d3180c9b6fb2c8b3bd266db6ede9 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 14:39:53 +0100
Subject: [PATCH 72/87] c9-auto-bump 3.1.895

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d9ba808d..95a076db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.894",
+    "version": "3.1.895",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3a74876997bf7e741358ccf881c4d7f32ea877d6 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 15:50:32 +0100
Subject: [PATCH 73/87] c9-auto-bump 3.1.896

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 95a076db..6c948f8f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.895",
+    "version": "3.1.896",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 6ca77bbeb2e79fefebc942ca3a39e6a2d615a651 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 15:50:51 +0100
Subject: [PATCH 74/87] c9-auto-bump 3.1.897

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6c948f8f..52fd2469 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.896",
+    "version": "3.1.897",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From b08dec3a5667af9d3c033d3572e6d7cc90debed9 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 15:52:15 +0100
Subject: [PATCH 75/87] c9-auto-bump 3.1.898

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 52fd2469..d315b771 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.897",
+    "version": "3.1.898",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 7fb73c9c74e63c900c0465872da3e66b27b4c2f9 Mon Sep 17 00:00:00 2001
From: Dana Ivan <dana@c9.io>
Date: Mon, 4 Jan 2016 15:13:32 +0000
Subject: [PATCH 76/87] Standardizes user traits sent to analytics

---
 node_modules/c9/format-user-analytics.js | 46 ++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 node_modules/c9/format-user-analytics.js

diff --git a/node_modules/c9/format-user-analytics.js b/node_modules/c9/format-user-analytics.js
new file mode 100644
index 00000000..b7612ba3
--- /dev/null
+++ b/node_modules/c9/format-user-analytics.js
@@ -0,0 +1,46 @@
+if (define === undefined) {
+    var define = function(fn) {
+        fn(require, exports, module);
+    };
+}
+
+define(function(require, exports, module) {
+    "use strict";
+
+    function formatUser(user) {
+        if (!user) return {}; // empty traits get ignored
+
+         var traits = {
+                uid: user.id || user.uid,
+                username: user.name || user.username,
+                email: user.email,
+                createdAt: user.date_add,
+                active: !!user.active,
+                firstName: getFirstName(user),
+                lastName: getLastName(user),
+                name: user.fullname || user.name,
+                pricingPlan: user.premium ? "Premium" : "Free",
+                region: user.region
+            };
+
+        return traits;
+    }
+
+    function getFirstName(user){
+        if (user.firstname) return user.firstname;
+        
+        if (!user.fullname) return undefined;
+       
+        return user.fullname.split(' ').slice(0, 1).join(' ');
+    }
+
+    function getLastName(user){
+        if (user.lastname) return user.lastname;
+        
+        if (!user.fullname) return undefined;
+       
+        return user.fullname.split(' ').slice(1).join(' ');
+    }
+
+    module.exports = formatUser;
+});
\ No newline at end of file

From bb010cea8eb2ddc5b129d97ad625200c1448b3db Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 16:28:32 +0100
Subject: [PATCH 77/87] c9-auto-bump 3.1.899

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d315b771..5daabe69 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.898",
+    "version": "3.1.899",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 2045f424021672c1968b99e7c807c24461e3bcfe Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 16:34:52 +0100
Subject: [PATCH 78/87] c9-auto-bump 3.1.900

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5daabe69..94052017 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.899",
+    "version": "3.1.900",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 3db465c10017cc2f2f3e9525d21ec318a331e376 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 16:43:59 +0100
Subject: [PATCH 79/87] c9-auto-bump 3.1.901

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 94052017..d939fc9c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.900",
+    "version": "3.1.901",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 4328d7dc7ea27e458b01505d5cd24457c5d95af9 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 16:48:21 +0100
Subject: [PATCH 80/87] c9-auto-bump 3.1.902

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d939fc9c..e3303b92 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.901",
+    "version": "3.1.902",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 799b98d08a3f7bb102cb176de0689af0e4709052 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 17:13:29 +0100
Subject: [PATCH 81/87] c9-auto-bump 3.1.903

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e3303b92..dcebd32f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.902",
+    "version": "3.1.903",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From ec5d57a5bb7e8edf8ab7d933e0f35c55e306e0bb Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 19:28:56 +0100
Subject: [PATCH 82/87] c9-auto-bump 3.1.904

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7d8aa6b0..e037b3ef 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.903",
+    "version": "3.1.904",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 28f0ec10106164dd419e995bb7d00a6031cae829 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 20:16:58 +0100
Subject: [PATCH 83/87] c9-auto-bump 3.1.905

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e037b3ef..1738cc35 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.904",
+    "version": "3.1.905",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 32c8d42b46f5ac0acecd365d74ddcbe81863f565 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Mon, 4 Jan 2016 22:08:16 +0100
Subject: [PATCH 84/87] c9-auto-bump 3.1.906

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1738cc35..bacc98af 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.905",
+    "version": "3.1.906",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 09ebb83340be572ea961878879a4bbc838eae767 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 5 Jan 2016 09:54:54 +0100
Subject: [PATCH 85/87] c9-auto-bump 3.1.907

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bacc98af..9b86fd16 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.906",
+    "version": "3.1.907",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 72c0199f68decbdf7932cffea4b80508ad57af38 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 5 Jan 2016 10:34:16 +0100
Subject: [PATCH 86/87] c9-auto-bump 3.1.908

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9b86fd16..b47adb11 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.907",
+    "version": "3.1.908",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",

From 564b2e884daafbbfb1c5d7ec2ec517f9134c44a5 Mon Sep 17 00:00:00 2001
From: c9bot <bas+bot@c9.io>
Date: Tue, 5 Jan 2016 11:00:00 +0100
Subject: [PATCH 87/87] c9-auto-bump 3.1.909

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b47adb11..a43477db 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "c9",
     "description": "New Cloud9 Client",
-    "version": "3.1.908",
+    "version": "3.1.909",
     "author": "Ajax.org B.V. <info@ajax.org>",
     "private": true,
     "main": "bin/c9",