diff --git a/.ebextensions/deploy.config b/.ebextensions/deploy.config
index 2a73ab196d..29a1919ef7 100644
--- a/.ebextensions/deploy.config
+++ b/.ebextensions/deploy.config
@@ -14,7 +14,7 @@ files:
     owner: root
     group: users
     content: |
-      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@3
+      $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@4
 container_commands:
   01_makeBabel:
     command: "touch /tmp/.babel.json"
diff --git a/.nvmrc b/.nvmrc
index f77856a6f1..62f9457511 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-4.3.1
+6
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index dd775c8f72..92469e9339 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: node_js
 node_js:
-  - '4.3.1'
+  - '6'
 before_install:
-  - npm install -g npm@3
+  - npm install -g npm@4
   - if [ $REQUIRES_SERVER ]; then sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 7F0CEB10; echo 'deb http://downloads-distro.mongodb.org/repo/ubuntu-upstart dist 10gen' | sudo tee /etc/apt/sources.list.d/mongodb.list; sudo apt-get update; sudo apt-get install mongodb-org-server; fi
 before_script:
   - npm run test:build
diff --git a/Dockerfile b/Dockerfile
index 97e458f39b..407c416f21 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ RUN apt-get install -y \
     python
 
 # Install NodeJS
-RUN curl -sL https://deb.nodesource.com/setup_4.x | sudo -E bash -
+RUN curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
 RUN apt-get install -y nodejs
 
 # Clean up package management
@@ -25,7 +25,7 @@ RUN apt-get clean
 RUN rm -rf /var/lib/apt/lists/*
 
 # Install global packages
-RUN npm install -g npm@3
+RUN npm install -g npm@4
 RUN npm install -g gulp grunt-cli bower
 
 # Clone Habitica repo and install dependencies
diff --git a/gulp/gulp-tests.js b/gulp/gulp-tests.js
index 6930ed8833..cbc3d8f3e5 100644
--- a/gulp/gulp-tests.js
+++ b/gulp/gulp-tests.js
@@ -318,7 +318,7 @@ gulp.task('test:api-v3:integration:watch', () => {
 
 gulp.task('test:api-v3:integration:separate-server', (done) => {
   let runner = exec(
-    testBin('mocha test/api/v3/integration --recursive', 'LOAD_SERVER=0'),
+    testBin('mocha test/api/v3/integration --recursive --require ./test/helpers/start-server', 'LOAD_SERVER=0'),
     {maxBuffer: 500 * 1024},
     (err, stdout, stderr) => done(err)
   );
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 99568640ac..5a3b4a6942 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -509,9 +509,9 @@
       "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.5.3.tgz"
     },
     "aws-sdk": {
-      "version": "2.7.7",
-      "from": "aws-sdk@2.7.7",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.7.7.tgz",
+      "version": "2.7.9",
+      "from": "aws-sdk@>=2.0.25 <3.0.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.7.9.tgz",
       "dependencies": {
         "lodash": {
           "version": "3.5.0",
@@ -523,6 +523,11 @@
           "from": "sax@1.1.5",
           "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.5.tgz"
         },
+        "uuid": {
+          "version": "3.0.0",
+          "from": "uuid@3.0.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz"
+        },
         "xml2js": {
           "version": "0.4.15",
           "from": "xml2js@0.4.15",
@@ -654,7 +659,7 @@
     },
     "babel-loader": {
       "version": "6.2.8",
-      "from": "babel-loader@6.2.8",
+      "from": "babel-loader@>=6.0.0 <7.0.0",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.2.8.tgz"
     },
     "babel-messages": {
@@ -903,9 +908,9 @@
       "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz"
     },
     "babylon": {
-      "version": "6.14.0",
+      "version": "6.14.1",
       "from": "babylon@>=6.11.0 <7.0.0",
-      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.14.0.tgz"
+      "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.14.1.tgz"
     },
     "backo2": {
       "version": "1.0.2",
@@ -1068,6 +1073,11 @@
           "from": "debug@>=2.2.0 <2.3.0",
           "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"
         },
+        "iconv-lite": {
+          "version": "0.4.13",
+          "from": "iconv-lite@0.4.13",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
+        },
         "ms": {
           "version": "0.7.1",
           "from": "ms@0.7.1",
@@ -1504,9 +1514,9 @@
       "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.0.6.tgz"
     },
     "browser-pack": {
-      "version": "6.0.1",
+      "version": "6.0.2",
       "from": "browser-pack@>=6.0.1 <7.0.0",
-      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.0.2.tgz"
     },
     "browser-resolve": {
       "version": "1.11.2",
@@ -1606,9 +1616,9 @@
       "optional": true
     },
     "bson": {
-      "version": "0.5.6",
+      "version": "0.5.7",
       "from": "bson@>=0.5.4 <0.6.0",
-      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.6.tgz"
+      "resolved": "https://registry.npmjs.org/bson/-/bson-0.5.7.tgz"
     },
     "buffer": {
       "version": "4.9.1",
@@ -1616,9 +1626,9 @@
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz"
     },
     "buffer-crc32": {
-      "version": "0.2.5",
+      "version": "0.2.13",
       "from": "buffer-crc32@>=0.2.3 <0.3.0",
-      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
     },
     "buffer-peek-stream": {
       "version": "1.0.1",
@@ -1717,9 +1727,9 @@
       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"
     },
     "caniuse-db": {
-      "version": "1.0.30000584",
+      "version": "1.0.30000590",
       "from": "caniuse-db@>=1.0.30000578 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000584.tgz"
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000590.tgz"
     },
     "capture-stack-trace": {
       "version": "1.0.0",
@@ -2053,16 +2063,28 @@
       "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
     },
     "commoner": {
-      "version": "0.10.4",
+      "version": "0.10.8",
       "from": "commoner@>=0.10.3 <0.11.0",
-      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz",
+      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.8.tgz",
       "dev": true,
       "dependencies": {
+        "esprima": {
+          "version": "3.1.2",
+          "from": "esprima@>=3.1.0 <3.2.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.2.tgz",
+          "dev": true
+        },
         "glob": {
           "version": "5.0.15",
           "from": "glob@>=5.0.15 <6.0.0",
           "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
           "dev": true
+        },
+        "recast": {
+          "version": "0.11.18",
+          "from": "recast@>=0.11.17 <0.12.0",
+          "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.18.tgz",
+          "dev": true
         }
       }
     },
@@ -2287,7 +2309,7 @@
     },
     "coupon-code": {
       "version": "0.4.5",
-      "from": "coupon-code@0.4.5",
+      "from": "coupon-code@>=0.4.5 <0.5.0",
       "resolved": "https://registry.npmjs.org/coupon-code/-/coupon-code-0.4.5.tgz"
     },
     "coveralls": {
@@ -2361,9 +2383,9 @@
       "dev": true,
       "dependencies": {
         "lru-cache": {
-          "version": "4.0.1",
+          "version": "4.0.2",
           "from": "lru-cache@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz",
           "dev": true
         },
         "which": {
@@ -2437,9 +2459,9 @@
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz"
     },
     "cssnano": {
-      "version": "3.8.0",
+      "version": "3.8.1",
       "from": "cssnano@>=2.6.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.8.0.tgz"
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.8.1.tgz"
     },
     "csso": {
       "version": "2.2.1",
@@ -2489,9 +2511,9 @@
           "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"
         }
       }
     },
@@ -2516,9 +2538,9 @@
       "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz"
     },
     "dashdash": {
-      "version": "1.14.0",
+      "version": "1.14.1",
       "from": "dashdash@>=1.12.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
       "dependencies": {
         "assert-plus": {
           "version": "1.0.0",
@@ -2553,9 +2575,9 @@
       "resolved": "https://registry.npmjs.org/deap/-/deap-1.0.0.tgz"
     },
     "debug": {
-      "version": "2.3.2",
+      "version": "2.3.3",
       "from": "debug@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.2.tgz"
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"
     },
     "debug-fabulous": {
       "version": "0.0.4",
@@ -2902,9 +2924,9 @@
       "dev": true,
       "dependencies": {
         "esprima": {
-          "version": "3.1.1",
+          "version": "3.1.2",
           "from": "esprima@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.1.tgz",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.2.tgz",
           "dev": true
         }
       }
@@ -3586,7 +3608,7 @@
     },
     "eslint-plugin-html": {
       "version": "1.7.0",
-      "from": "eslint-plugin-html@1.7.0",
+      "from": "eslint-plugin-html@>=1.3.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/eslint-plugin-html/-/eslint-plugin-html-1.7.0.tgz",
       "dev": true,
       "dependencies": {
@@ -4127,9 +4149,9 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz",
       "dependencies": {
         "async": {
-          "version": "2.1.2",
+          "version": "2.1.4",
           "from": "async@>=2.0.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.1.2.tgz"
+          "resolved": "https://registry.npmjs.org/async/-/async-2.1.4.tgz"
         },
         "lodash": {
           "version": "4.17.2",
@@ -5057,26 +5079,21 @@
       "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz"
     },
     "global-prefix": {
-      "version": "0.1.4",
+      "version": "0.1.5",
       "from": "global-prefix@>=0.1.4 <0.2.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.5.tgz",
       "dependencies": {
-        "osenv": {
-          "version": "0.1.3",
-          "from": "osenv@>=0.1.3 <0.2.0",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.3.tgz"
-        },
         "which": {
           "version": "1.2.12",
-          "from": "which@>=1.2.10 <2.0.0",
+          "from": "which@>=1.2.12 <2.0.0",
           "resolved": "https://registry.npmjs.org/which/-/which-1.2.12.tgz"
         }
       }
     },
     "globals": {
-      "version": "9.13.0",
+      "version": "9.14.0",
       "from": "globals@>=9.0.0 <10.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-9.13.0.tgz"
+      "resolved": "https://registry.npmjs.org/globals/-/globals-9.14.0.tgz"
     },
     "globby": {
       "version": "4.1.0",
@@ -5133,9 +5150,9 @@
       "resolved": "https://registry.npmjs.org/got/-/got-6.6.3.tgz"
     },
     "graceful-fs": {
-      "version": "4.1.10",
+      "version": "4.1.11",
       "from": "graceful-fs@>=4.1.2 <5.0.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.10.tgz"
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"
     },
     "graceful-readlink": {
       "version": "1.0.1",
@@ -5487,9 +5504,9 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.4.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"
         }
       }
     },
@@ -5755,7 +5772,7 @@
     },
     "gulp-sourcemaps": {
       "version": "1.9.1",
-      "from": "gulp-sourcemaps@1.9.1",
+      "from": "gulp-sourcemaps@>=1.6.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.9.1.tgz",
       "dependencies": {
         "acorn": {
@@ -6074,6 +6091,11 @@
       "from": "home-or-tmp@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz"
     },
+    "homedir-polyfill": {
+      "version": "1.0.0",
+      "from": "homedir-polyfill@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.0.tgz"
+    },
     "hooker": {
       "version": "0.2.3",
       "from": "hooker@>=0.2.3 <0.3.0",
@@ -6101,9 +6123,9 @@
       "dev": true
     },
     "html-minifier": {
-      "version": "3.2.2",
+      "version": "3.2.3",
       "from": "html-minifier@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.2.3.tgz",
       "dependencies": {
         "async": {
           "version": "0.2.10",
@@ -6128,9 +6150,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.7.0 <2.8.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -6246,9 +6268,9 @@
       "resolved": "https://registry.npmjs.org/humanize-url/-/humanize-url-1.0.1.tgz"
     },
     "iconv-lite": {
-      "version": "0.4.13",
+      "version": "0.4.15",
       "from": "iconv-lite@>=0.4.13 <0.5.0",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"
     },
     "icss-replace-symbols": {
       "version": "1.0.2",
@@ -7040,9 +7062,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dev": true,
           "optional": true,
           "dependencies": {
@@ -7160,9 +7182,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dev": true,
           "optional": true,
           "dependencies": {
@@ -7229,9 +7251,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.4.19 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -7381,9 +7403,9 @@
       "dev": true
     },
     "json5": {
-      "version": "0.5.0",
+      "version": "0.5.1",
       "from": "json5@>=0.5.0 <0.6.0",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.0.tgz"
+      "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"
     },
     "jsonfile": {
       "version": "2.4.0",
@@ -7441,9 +7463,9 @@
           "optional": true
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "optional": true
         }
       }
@@ -7706,9 +7728,9 @@
           "dev": true
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dev": true,
           "optional": true,
           "dependencies": {
@@ -8032,7 +8054,14 @@
     "libmime": {
       "version": "2.1.0",
       "from": "libmime@2.1.0",
-      "resolved": "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-2.1.0.tgz",
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.13",
+          "from": "iconv-lite@0.4.13",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
+        }
+      }
     },
     "libqp": {
       "version": "1.1.0",
@@ -8680,21 +8709,14 @@
       "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
     },
     "merge-stream": {
-      "version": "1.0.0",
+      "version": "1.0.1",
       "from": "merge-stream@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz"
     },
     "method-override": {
       "version": "2.3.7",
-      "from": "method-override@2.3.7",
-      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.3.3",
-          "from": "debug@2.3.3",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.3.3.tgz"
-        }
-      }
+      "from": "method-override@>=2.3.5 <3.0.0",
+      "resolved": "https://registry.npmjs.org/method-override/-/method-override-2.3.7.tgz"
     },
     "methods": {
       "version": "1.1.2",
@@ -8717,14 +8739,14 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz"
     },
     "mime-db": {
-      "version": "1.24.0",
-      "from": "mime-db@>=1.24.0 <1.25.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.24.0.tgz"
+      "version": "1.25.0",
+      "from": "mime-db@>=1.25.0 <1.26.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.25.0.tgz"
     },
     "mime-types": {
-      "version": "2.1.12",
+      "version": "2.1.13",
       "from": "mime-types@>=2.1.7 <2.2.0",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.12.tgz"
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.13.tgz"
     },
     "minimalistic-assert": {
       "version": "1.0.0",
@@ -8916,7 +8938,7 @@
     },
     "moment": {
       "version": "2.17.0",
-      "from": "moment@2.17.0",
+      "from": "moment@>=2.13.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz"
     },
     "mongodb": {
@@ -8942,9 +8964,9 @@
       "resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.0.13.tgz"
     },
     "mongoose": {
-      "version": "4.6.6",
-      "from": "mongoose@4.6.6",
-      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.6.6.tgz",
+      "version": "4.7.1",
+      "from": "mongoose@>=4.7.1 <5.0.0",
+      "resolved": "https://registry.npmjs.org/mongoose/-/mongoose-4.7.1.tgz",
       "dependencies": {
         "async": {
           "version": "2.1.2",
@@ -9979,6 +10001,11 @@
       "from": "parse-json@>=2.2.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
     },
+    "parse-passwd": {
+      "version": "1.0.0",
+      "from": "parse-passwd@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
+    },
     "parsejson": {
       "version": "0.0.1",
       "from": "parsejson@0.0.1",
@@ -10094,9 +10121,9 @@
       "resolved": "https://registry.npmjs.org/paypal-ipn/-/paypal-ipn-3.0.0.tgz"
     },
     "paypal-rest-sdk": {
-      "version": "1.7.0",
+      "version": "1.7.1",
       "from": "paypal-rest-sdk@>=1.2.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/paypal-rest-sdk/-/paypal-rest-sdk-1.7.0.tgz"
+      "resolved": "https://registry.npmjs.org/paypal-rest-sdk/-/paypal-rest-sdk-1.7.1.tgz"
     },
     "pbkdf2": {
       "version": "3.0.9",
@@ -10230,9 +10257,9 @@
       "resolved": "https://registry.npmjs.org/pngjs2/-/pngjs2-1.2.0.tgz"
     },
     "postcss": {
-      "version": "5.2.5",
+      "version": "5.2.6",
       "from": "postcss@>=5.2.5 <6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.6.tgz",
       "dependencies": {
         "supports-color": {
           "version": "3.1.2",
@@ -10252,9 +10279,9 @@
       "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.1.tgz"
     },
     "postcss-convert-values": {
-      "version": "2.4.1",
+      "version": "2.5.0",
       "from": "postcss-convert-values@>=2.3.4 <3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.4.1.tgz"
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.5.0.tgz"
     },
     "postcss-discard-comments": {
       "version": "2.0.4",
@@ -10277,9 +10304,9 @@
       "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz"
     },
     "postcss-discard-unused": {
-      "version": "2.2.2",
+      "version": "2.2.3",
       "from": "postcss-discard-unused@>=2.2.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.2.tgz"
+      "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz"
     },
     "postcss-easy-import": {
       "version": "1.0.1",
@@ -10431,9 +10458,9 @@
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz"
     },
     "postcss-zindex": {
-      "version": "2.1.1",
+      "version": "2.2.0",
       "from": "postcss-zindex@>=2.0.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.1.1.tgz"
+      "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz"
     },
     "prelude-ls": {
       "version": "1.1.2",
@@ -10685,9 +10712,9 @@
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dependencies": {
             "source-map": {
               "version": "0.5.6",
@@ -10770,9 +10797,9 @@
       }
     },
     "pusher": {
-      "version": "1.5.0",
+      "version": "1.5.1",
       "from": "pusher@>=1.3.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/pusher/-/pusher-1.5.0.tgz"
+      "resolved": "https://registry.npmjs.org/pusher/-/pusher-1.5.1.tgz"
     },
     "q": {
       "version": "1.4.1",
@@ -10844,9 +10871,9 @@
       "dev": true
     },
     "randomatic": {
-      "version": "1.1.5",
+      "version": "1.1.6",
       "from": "randomatic@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.5.tgz"
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.6.tgz"
     },
     "randombytes": {
       "version": "2.0.3",
@@ -10861,7 +10888,14 @@
     "raw-body": {
       "version": "2.1.7",
       "from": "raw-body@>=2.1.7 <2.2.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz",
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.13",
+          "from": "iconv-lite@0.4.13",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
+        }
+      }
     },
     "rc": {
       "version": "1.1.6",
@@ -10983,16 +11017,9 @@
       "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz"
     },
     "reduce-function-call": {
-      "version": "1.0.1",
+      "version": "1.0.2",
       "from": "reduce-function-call@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.1.tgz",
-      "dependencies": {
-        "balanced-match": {
-          "version": "0.1.0",
-          "from": "balanced-match@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.1.0.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz"
     },
     "regenerate": {
       "version": "1.3.2",
@@ -11211,9 +11238,9 @@
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-1.0.1.tgz"
     },
     "rollup": {
-      "version": "0.36.3",
+      "version": "0.36.4",
       "from": "rollup@>=0.36.3 <0.37.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.36.3.tgz"
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.36.4.tgz"
     },
     "rsvp": {
       "version": "3.3.3",
@@ -12061,7 +12088,7 @@
     },
     "stripe": {
       "version": "4.13.0",
-      "from": "stripe@4.13.0",
+      "from": "stripe@>=4.2.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/stripe/-/stripe-4.13.0.tgz",
       "dependencies": {
         "bluebird": {
@@ -12238,9 +12265,9 @@
           "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz"
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz"
         }
       }
     },
@@ -12331,9 +12358,16 @@
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
     },
     "through2": {
-      "version": "2.0.1",
+      "version": "2.0.3",
       "from": "through2@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.2.2",
+          "from": "readable-stream@>=2.1.5 <3.0.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.2.tgz"
+        }
+      }
     },
     "through2-concurrent": {
       "version": "1.1.1",
@@ -12583,9 +12617,9 @@
       "dev": true
     },
     "type-is": {
-      "version": "1.6.13",
+      "version": "1.6.14",
       "from": "type-is@>=1.6.13 <1.7.0",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"
     },
     "typedarray": {
       "version": "0.0.6",
@@ -13083,9 +13117,9 @@
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
     },
     "vue": {
-      "version": "2.1.0",
-      "from": "vue@2.1.0",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.1.0.tgz"
+      "version": "2.1.3",
+      "from": "vue@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.1.3.tgz"
     },
     "vue-hot-reload-api": {
       "version": "1.3.3",
@@ -13093,14 +13127,14 @@
       "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-1.3.3.tgz"
     },
     "vue-loader": {
-      "version": "10.0.0",
-      "from": "vue-loader@10.0.0",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-10.0.0.tgz",
+      "version": "10.0.2",
+      "from": "vue-loader@>=10.0.0 <11.0.0",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-10.0.2.tgz",
       "dependencies": {
         "lru-cache": {
-          "version": "4.0.1",
+          "version": "4.0.2",
           "from": "lru-cache@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"
         },
         "vue-hot-reload-api": {
           "version": "2.0.6",
@@ -13115,9 +13149,9 @@
       "resolved": "https://registry.npmjs.org/vue-resource/-/vue-resource-1.0.3.tgz"
     },
     "vue-router": {
-      "version": "2.0.3",
-      "from": "vue-router@2.0.3",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.0.3.tgz"
+      "version": "2.1.0",
+      "from": "vue-router@>=2.0.0-rc.5 <3.0.0",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.1.0.tgz"
     },
     "vue-style-loader": {
       "version": "1.0.0",
@@ -13125,14 +13159,14 @@
       "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-1.0.0.tgz"
     },
     "vue-template-compiler": {
-      "version": "2.1.0",
-      "from": "vue-template-compiler@latest",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.1.0.tgz"
+      "version": "2.1.3",
+      "from": "vue-template-compiler@>=2.1.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.1.3.tgz"
     },
     "vue-template-es2015-compiler": {
-      "version": "1.3.0",
+      "version": "1.3.2",
       "from": "vue-template-es2015-compiler@>=1.2.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.3.2.tgz"
     },
     "w3counter": {
       "version": "3.0.1",
@@ -13189,9 +13223,9 @@
           "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
         },
         "uglify-js": {
-          "version": "2.7.4",
+          "version": "2.7.5",
           "from": "uglify-js@>=2.7.3 <2.8.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.5.tgz",
           "dependencies": {
             "async": {
               "version": "0.2.10",
@@ -13304,9 +13338,9 @@
       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
     },
     "wrap-ansi": {
-      "version": "2.0.0",
+      "version": "2.1.0",
       "from": "wrap-ansi@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
     },
     "wrap-fn": {
       "version": "0.1.5",
@@ -13388,9 +13422,9 @@
       "dev": true
     },
     "xpath.js": {
-      "version": "1.0.6",
+      "version": "1.0.7",
       "from": "xpath.js@>=0.0.3",
-      "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.6.tgz"
+      "resolved": "https://registry.npmjs.org/xpath.js/-/xpath.js-1.0.7.tgz"
     },
     "xregexp": {
       "version": "2.0.0",
diff --git a/package.json b/package.json
index 71cfcd5a4e..7c7315fe49 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "compression": "^1.6.1",
     "connect-ratelimit": "0.0.7",
     "cookie-session": "^1.2.0",
-    "coupon-code": "^0.4.3",
+    "coupon-code": "^0.4.5",
     "css-loader": "^0.23.1",
     "csv-stringify": "^1.0.2",
     "cwait": "^1.0.0",
@@ -77,7 +77,7 @@
     "merge-stream": "^1.0.0",
     "method-override": "^2.3.5",
     "moment": "^2.13.0",
-    "mongoose": "4.6.6",
+    "mongoose": "^4.7.1",
     "mongoose-id-autoinc": "~2013.7.14-4",
     "morgan": "^1.7.0",
     "nconf": "~0.8.2",
@@ -128,8 +128,8 @@
   },
   "private": true,
   "engines": {
-    "node": "^4.3.1",
-    "npm": "^3.8.9"
+    "node": "^6.9.1",
+    "npm": "^4.0.2"
   },
   "scripts": {
     "lint": "eslint --ext .js,.vue .",
diff --git a/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js b/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js
index 17a50520eb..7838d4194a 100644
--- a/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js
+++ b/test/api/v3/integration/payments/POST-payments_amazon_createOrderReferenceId.test.js
@@ -10,13 +10,11 @@ describe('payments - amazon - #createOrderReferenceId', () => {
     user = await generateUser();
   });
 
-  it('verifies billingAgreementId', async (done) => {
-    try {
-      await user.post(endpoint);
-    } catch (e) {
-      // Parameter AWSAccessKeyId cannot be empty.
-      expect(e.error).to.eql('BadRequest');
-      done();
-    }
+  it('verifies billingAgreementId', async () => {
+    await expect(user.post(endpoint)).to.eventually.be.rejected.and.eql({
+      code: 400,
+      error: 'BadRequest',
+      message: 'Missing req.body.billingAgreementId',
+    });
   });
 });