Merge branch 'es2015'

# Conflicts:
#	lib/bucket.js
#	package.json

Author: dsfields

.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 node_js:
-  - 0.10
-  - 0.12
+  - 4.0
 before_script:
   - npm install -g gulp
 script: gulp
+sudo: required
+dist: trusty

CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log
 
+## 2.0
+
+### 2.0.0
+* Switching to ES2015 syntax.
+* Updating Couchnode to latest version.
+* The `couchbase` and `bluebird` modules are now `peerDependencies`.
+* Bug fix: ensuring the proper `this` context is used when calling promisify.
+
 ## 1.0
 
 ### 1.0.1
-* Fixing a leak of the `arguments` object to avoid optimizing compiler bailouts.
+* Bug fix: fixing a leak of the `arguments` object to avoid optimizing compiler bailouts.
 
 ### 1.0.0
 * Initial release.

README.md

@@ -7,17 +7,17 @@ Just like the [Couchbase Node.js SDK](http://developer.couchbase.com/documentati
 
 The current version supports Couchbase Node.js SDK version 2.1.2.
 
-Promises are created using the [Bluebird](http://bluebirdjs.com/docs/getting-started.html) Promises library.  If you absolutely must use native ECMAScript Promises, then have a look at [couchbase-es-promises](https://www.npmjs.com/package/couchbase-promises).  I _highly_ recommend avoiding couchbase-es-promises, as Bluebird is compatible with native promises, and offers [an order of magnitude more performance](https://github.com/petkaantonov/bluebird/tree/master/benchmark).
+Promises are created using the [Bluebird](http://bluebirdjs.com/docs/getting-started.html) Promises library.  If you absolutely must use native ECMAScript Promises, then have a look at [couchbase-es-promises](https://www.npmjs.com/package/couchbase-es-promises).  I _highly_ recommend avoiding couchbase-es-promises, as Bluebird is compatible with native promises, and offers [an order of magnitude more performance](https://github.com/petkaantonov/bluebird/tree/master/benchmark).
 
 ## General Usage
 Usage is almost exactly the same as the native SDK, but with the added ability to use Promises instead of callbacks.
 
 A user repository module with a simple lookup...
 
 ```js
-let couchbase = require('couchbase-promises');
-let cluster = new couchbase.Cluster('couchbase://127.0.0.1');
-let bucket = cluster.openBucket();
+const couchbase = require('couchbase-promises');
+const cluster = new couchbase.Cluster('couchbase://127.0.0.1');
+const bucket = cluster.openBucket();
 
 function UserNotFoundError() {
   Error.call(this);

gulpfile.js

@@ -1,8 +1,8 @@
-var gulp = require('gulp');
-var eslint = require('gulp-eslint');
-var istanbul = require('gulp-istanbul');
-var jsvalidate = require('gulp-jsvalidate')
-var mocha = require('gulp-mocha');
+const gulp = require('gulp');
+const eslint = require('gulp-eslint');
+const istanbul = require('gulp-istanbul');
+const jsvalidate = require('gulp-jsvalidate')
+const mocha = require('gulp-mocha');
 
 gulp.task('lint', function() {
   return gulp.src(['./**/*.js', '!./node_modules/**', '!./coverage/**'])
@@ -11,15 +11,15 @@ gulp.task('lint', function() {
 });
 
 gulp.task('test', function() {
-  return gulp.src('tests/unit/**/*.js')
+  return gulp.src('./tests/unit/**/*.js')
     .pipe(mocha({ reporter: 'spec' }))
     .pipe(istanbul.writeReports())
     .pipe(istanbul.enforceThresholds({ thresholds: { global: 90 } }));
 });
 
 gulp.task('jsvalidate', function() {
-  return gulp.src('**/*.js')
+  return gulp.src(['./**/*.js', '!./node_modules/**', '!./coverage/**'])
     .pipe(jsvalidate());
 });
 
-gulp.task('default', ['lint', 'test']);
+gulp.task('default', ['test']);