Merge branch 'master' into jl-std-docs-3

docs/tutorial/using-selenium-and-webdriver.md

@@ -72,7 +72,7 @@ driver.quit();
 
 ## Setting up with WebdriverIO
 
-[WebdriverIO](http://webdriver.io/) provided a Node package for testing with web driver.
+[WebdriverIO](http://webdriver.io/) provides a Node package for testing with web driver.
 
 ### 1. Start chrome driver
 
@@ -86,7 +86,7 @@ Only local connections are allowed.
 
 Remember the port number `9515`, which will be used later
 
-### 2. Install WebDriverJS
+### 2. Install WebdriverIO
 
 ```bash
 $ npm install webdriverio
@@ -96,22 +96,23 @@ $ npm install webdriverio
 ```javascript
 var webdriverio = require('webdriverio');
 var options = {
-	host: "localhost", // Use localhost as chrome driver server 
+    host: "localhost", // Use localhost as chrome driver server 
     port: 9515,        // "9515" is the port opened by chrome driver.
     desiredCapabilities: {
-            browserName: 'chrome',
-            chromeOptions: {binary: '/Path-to-Your-App.app/Electron'} // Path to your Electron binary.
-        }
+        browserName: 'chrome',
+        chromeOptions: {binary: '/Path-to-Your-App.app/Electron'} // Path to your Electron binary.
+    }
 };
 
-webdriverio
-    .remote(options)
+var client = webdriverio.remote(options);
+
+client
     .init()
     .url('http://google.com')
     .setValue('#q', 'webdriverio')
     .click('#btnG')
-    .title(function(err, res) {
-        console.log('Title was: ' + res.value);
+    .getTitle().then(function(title) {
+        console.log('Title was: ' + title);
     })
     .end();
 ```

vendor/brightray

@@ -1 +1 @@
-Subproject commit 939a7b814282a6433b8d7e3c9cfc74451360c07f
+Subproject commit 5b2a73c68a986780e67eb2e738327d35c7c1c21e

vendor/node

@@ -1 +1 @@
-Subproject commit 205b013ac86e5500678a791cd54f305580fa4f4b
+Subproject commit b9b6dd9f3fc095e66a3b89d3efd50f7c576da2c8