Merge branch 'master' of github.com:elasticsearch/elasticsearch-js

CONTRIBUTING.md

@@ -6,8 +6,6 @@ The process for contributing to any of the Elasticsearch repositories is similar
 
   While developing, be sure to run JSHint on the files you modify. This is simple with most IDE's and the project has .jshintrc files in the proper places, make sure jshint is using them.
 
-  We use the `"white": true` jshint config option to enforce style, but the
-
 2. Write tests
 
   Please write test cases to exercise your changes.

README.md

@@ -1,6 +1,6 @@
 # elasticsearch.js
 
-The official low-level Elasticsearch client for Node.js and the browser.
+The official low-level Elasticsearch client for Node.js and the browser. [![Build Status](https://build.elasticsearch.org/job/es-js_nightly/badge/icon)](https://build.elasticsearch.org/job/es-js_nightly/)
 
 ## Features
 
@@ -47,4 +47,4 @@ This software is licensed under the Apache 2 license, quoted below.
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
-    limitations under the License.
+    limitations under the License.