Merge upstream changes

Author: jlengstorf

package.json

@@ -43,10 +43,10 @@
   },
   "devDependencies": {
     "@gramps/cli": "^1.0.0-beta.4",
-    "@gramps/gramps": "^1.0.0-beta-7",
+    "@gramps/gramps": "^1.0.0-beta-9",
     "babel-cli": "^6.24.1",
     "babel-eslint": "^8.0.1",
-    "babel-jest": "^21.2.0",
+    "babel-jest": "^22.0.0",
     "babel-plugin-inline-import": "^2.0.6",
     "babel-preset-env": "^1.6.1",
     "babel-preset-stage-2": "^6.24.1",
@@ -59,7 +59,7 @@
     "graphql": "^0.11.7",
     "graphql-tools": "^2.5.1",
     "husky": "^0.14.3",
-    "jest": "^21.2.1",
+    "jest": "^22.0.0",
     "nodemon": "^1.11.0",
     "prettier": "^1.5.3",
     "semantic-release": "^8.2.0"