Merge remote-tracking branch 'origin/master' into docker-ci2

.gitignore

@@ -77,3 +77,4 @@ plugins/c9.proxy/haproxy-*
 npm-debug.log
 foo.js
 hello.js
+plugins/c9.docker/containers/ci/files/github_c9_newclient

package.json

@@ -66,6 +66,7 @@
         "c9.ide.find.infiles": "#1b83cf12f1",
         "c9.ide.find.replace": "#e4daf722b8",
         "c9.ide.run.debug": "#638e6b00b3",
+        "c9.automate": "#86bf1ee1ca",
         "c9.ide.ace.emmet": "#e5f1a92ac3",
         "c9.ide.ace.gotoline": "#4d1a93172c",
         "c9.ide.ace.keymaps": "#6c4bb65b1f",