diff --git a/.eslintrc b/.eslintrc
index 9388fa2..b420c44 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,6 @@
 {
   "extends": "madewithlove",
   "rules": {
-    "no-prototype-builtins": 0,
-    "promise/always-return": 0
+    "no-prototype-builtins": 0
   }
 }
diff --git a/package.json b/package.json
index 11b81e4..262d0a6 100644
--- a/package.json
+++ b/package.json
@@ -17,23 +17,22 @@
   "license": "MIT",
   "dependencies": {
     "isomorphic-fetch": "^2.2.1",
-    "lodash": "^4.13.1",
+    "lodash": "^4.15.0",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "eslint": "^3.0.1",
+    "eslint": "^3.5.0",
     "eslint-config-madewithlove": "^3.4.2",
     "fetch-mock": "^4.6.1",
     "jest": "^15.1.1",
-    "madewithlove-webpack-config": "^4.1.0",
-    "webpack": "^1.13.1"
+    "madewithlove-webpack-config": "^4.1.1",
+    "webpack": "^1.13.2"
   },
   "scripts": {
     "build": "BABEL_ENV=production webpack --progress",
     "prepublish": "npm run build",
     "postversion": "git push; git push --tags; npm publish",
     "lint": "eslint src",
-    "test": "mocha tests --recursive --compilers js:babel-core/register",
-    "test:watch": "npm run test -- --watch"
+    "test": "jest"
   }
 }