diff --git a/package-lock.json b/package-lock.json
index 601d875..59ccda9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4852,9 +4852,9 @@
 			"dev": true
 		},
 		"nyc": {
-			"version": "11.4.1",
-			"resolved": "https://registry.npmjs.org/nyc/-/nyc-11.4.1.tgz",
-			"integrity": "sha512-5eCZpvaksFVjP2rt1r60cfXmt3MUtsQDw8bAzNqNEr4WLvUMLgiVENMf/B9bE9YAX0mGVvaGA3v9IS9ekNqB1Q==",
+			"version": "11.6.0",
+			"resolved": "https://registry.npmjs.org/nyc/-/nyc-11.6.0.tgz",
+			"integrity": "sha512-ZaXCh0wmbk2aSBH2B5hZGGvK2s9aM8DIm2rVY+BG3Fx8tUS+bpJSswUVZqOD1YfCmnYRFSqgYJSr7UeeUcW0jg==",
 			"dev": true,
 			"requires": {
 				"archy": "1.0.0",
@@ -4867,23 +4867,23 @@
 				"find-up": "2.1.0",
 				"foreground-child": "1.5.6",
 				"glob": "7.1.2",
-				"istanbul-lib-coverage": "1.1.1",
+				"istanbul-lib-coverage": "1.2.0",
 				"istanbul-lib-hook": "1.1.0",
-				"istanbul-lib-instrument": "1.9.1",
-				"istanbul-lib-report": "1.1.2",
-				"istanbul-lib-source-maps": "1.2.2",
-				"istanbul-reports": "1.1.3",
+				"istanbul-lib-instrument": "1.10.1",
+				"istanbul-lib-report": "1.1.3",
+				"istanbul-lib-source-maps": "1.2.3",
+				"istanbul-reports": "1.3.0",
 				"md5-hex": "1.3.0",
-				"merge-source-map": "1.0.4",
+				"merge-source-map": "1.1.0",
 				"micromatch": "2.3.11",
 				"mkdirp": "0.5.1",
 				"resolve-from": "2.0.0",
 				"rimraf": "2.6.2",
 				"signal-exit": "3.0.2",
 				"spawn-wrap": "1.4.2",
-				"test-exclude": "4.1.1",
-				"yargs": "10.0.3",
-				"yargs-parser": "8.0.0"
+				"test-exclude": "4.2.1",
+				"yargs": "11.1.0",
+				"yargs-parser": "8.1.0"
 			},
 			"dependencies": {
 				"align-text": {
@@ -4937,6 +4937,11 @@
 					"bundled": true,
 					"dev": true
 				},
+				"arr-union": {
+					"version": "3.1.0",
+					"bundled": true,
+					"dev": true
+				},
 				"array-unique": {
 					"version": "0.2.1",
 					"bundled": true,
@@ -4947,11 +4952,21 @@
 					"bundled": true,
 					"dev": true
 				},
+				"assign-symbols": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
 				"async": {
 					"version": "1.5.2",
 					"bundled": true,
 					"dev": true
 				},
+				"atob": {
+					"version": "2.0.3",
+					"bundled": true,
+					"dev": true
+				},
 				"babel-code-frame": {
 					"version": "6.26.0",
 					"bundled": true,
@@ -4963,7 +4978,7 @@
 					}
 				},
 				"babel-generator": {
-					"version": "6.26.0",
+					"version": "6.26.1",
 					"bundled": true,
 					"dev": true,
 					"requires": {
@@ -4972,7 +4987,7 @@
 						"babel-types": "6.26.0",
 						"detect-indent": "4.0.0",
 						"jsesc": "1.3.0",
-						"lodash": "4.17.4",
+						"lodash": "4.17.5",
 						"source-map": "0.5.7",
 						"trim-right": "1.0.1"
 					}
@@ -5003,7 +5018,7 @@
 						"babel-traverse": "6.26.0",
 						"babel-types": "6.26.0",
 						"babylon": "6.18.0",
-						"lodash": "4.17.4"
+						"lodash": "4.17.5"
 					}
 				},
 				"babel-traverse": {
@@ -5018,8 +5033,8 @@
 						"babylon": "6.18.0",
 						"debug": "2.6.9",
 						"globals": "9.18.0",
-						"invariant": "2.2.2",
-						"lodash": "4.17.4"
+						"invariant": "2.2.3",
+						"lodash": "4.17.5"
 					}
 				},
 				"babel-types": {
@@ -5029,7 +5044,7 @@
 					"requires": {
 						"babel-runtime": "6.26.0",
 						"esutils": "2.0.2",
-						"lodash": "4.17.4",
+						"lodash": "4.17.5",
 						"to-fast-properties": "1.0.3"
 					}
 				},
@@ -5043,8 +5058,37 @@
 					"bundled": true,
 					"dev": true
 				},
+				"base": {
+					"version": "0.11.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"cache-base": "1.0.1",
+						"class-utils": "0.3.6",
+						"component-emitter": "1.2.1",
+						"define-property": "1.0.0",
+						"isobject": "3.0.1",
+						"mixin-deep": "1.3.1",
+						"pascalcase": "0.1.1"
+					},
+					"dependencies": {
+						"define-property": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-descriptor": "1.0.2"
+							}
+						},
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"brace-expansion": {
-					"version": "1.1.8",
+					"version": "1.1.11",
 					"bundled": true,
 					"dev": true,
 					"requires": {
@@ -5067,6 +5111,29 @@
 					"bundled": true,
 					"dev": true
 				},
+				"cache-base": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"collection-visit": "1.0.0",
+						"component-emitter": "1.2.1",
+						"get-value": "2.0.6",
+						"has-value": "1.0.0",
+						"isobject": "3.0.1",
+						"set-value": "2.0.0",
+						"to-object-path": "0.3.0",
+						"union-value": "1.0.0",
+						"unset-value": "1.0.0"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"caching-transform": {
 					"version": "1.0.1",
 					"bundled": true,
@@ -5105,6 +5172,83 @@
 						"supports-color": "2.0.0"
 					}
 				},
+				"class-utils": {
+					"version": "0.3.6",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"arr-union": "3.1.0",
+						"define-property": "0.2.5",
+						"isobject": "3.0.1",
+						"static-extend": "0.1.2"
+					},
+					"dependencies": {
+						"define-property": {
+							"version": "0.2.5",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-descriptor": "0.1.6"
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-accessor-descriptor": "0.1.6",
+								"is-data-descriptor": "0.1.4",
+								"kind-of": "5.1.0"
+							}
+						},
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						},
+						"kind-of": {
+							"version": "5.1.0",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"cliui": {
 					"version": "2.1.0",
 					"bundled": true,
@@ -5129,11 +5273,25 @@
 					"bundled": true,
 					"dev": true
 				},
+				"collection-visit": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"map-visit": "1.0.0",
+						"object-visit": "1.0.1"
+					}
+				},
 				"commondir": {
 					"version": "1.0.1",
 					"bundled": true,
 					"dev": true
 				},
+				"component-emitter": {
+					"version": "1.2.1",
+					"bundled": true,
+					"dev": true
+				},
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
@@ -5144,6 +5302,11 @@
 					"bundled": true,
 					"dev": true
 				},
+				"copy-descriptor": {
+					"version": "0.1.1",
+					"bundled": true,
+					"dev": true
+				},
 				"core-js": {
 					"version": "2.5.3",
 					"bundled": true,
@@ -5154,7 +5317,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"lru-cache": "4.1.1",
+						"lru-cache": "4.1.2",
 						"which": "1.3.0"
 					}
 				},
@@ -5176,6 +5339,11 @@
 					"bundled": true,
 					"dev": true
 				},
+				"decode-uri-component": {
+					"version": "0.2.0",
+					"bundled": true,
+					"dev": true
+				},
 				"default-require-extensions": {
 					"version": "1.0.0",
 					"bundled": true,
@@ -5184,6 +5352,22 @@
 						"strip-bom": "2.0.0"
 					}
 				},
+				"define-property": {
+					"version": "2.0.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-descriptor": "1.0.2",
+						"isobject": "3.0.1"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"detect-indent": {
 					"version": "4.0.0",
 					"bundled": true,
@@ -5229,7 +5413,7 @@
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"lru-cache": "4.1.1",
+								"lru-cache": "4.1.2",
 								"shebang-command": "1.2.0",
 								"which": "1.3.0"
 							}
@@ -5252,6 +5436,25 @@
 						"fill-range": "2.2.3"
 					}
 				},
+				"extend-shallow": {
+					"version": "3.0.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"assign-symbols": "1.0.0",
+						"is-extendable": "1.0.1"
+					},
+					"dependencies": {
+						"is-extendable": {
+							"version": "1.0.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-plain-object": "2.0.4"
+							}
+						}
+					}
+				},
 				"extglob": {
 					"version": "0.3.2",
 					"bundled": true,
@@ -5317,6 +5520,14 @@
 						"signal-exit": "3.0.2"
 					}
 				},
+				"fragment-cache": {
+					"version": "0.2.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"map-cache": "0.2.2"
+					}
+				},
 				"fs.realpath": {
 					"version": "1.0.0",
 					"bundled": true,
@@ -5332,6 +5543,11 @@
 					"bundled": true,
 					"dev": true
 				},
+				"get-value": {
+					"version": "2.0.6",
+					"bundled": true,
+					"dev": true
+				},
 				"glob": {
 					"version": "7.1.2",
 					"bundled": true,
@@ -5406,8 +5622,62 @@
 					"bundled": true,
 					"dev": true
 				},
+				"has-value": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"get-value": "2.0.6",
+						"has-values": "1.0.0",
+						"isobject": "3.0.1"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"has-values": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-number": "3.0.0",
+						"kind-of": "4.0.0"
+					},
+					"dependencies": {
+						"is-number": {
+							"version": "3.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"kind-of": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-buffer": "1.1.6"
+							}
+						}
+					}
+				},
 				"hosted-git-info": {
-					"version": "2.5.0",
+					"version": "2.6.0",
 					"bundled": true,
 					"dev": true
 				},
@@ -5431,7 +5701,7 @@
 					"dev": true
 				},
 				"invariant": {
-					"version": "2.2.2",
+					"version": "2.2.3",
 					"bundled": true,
 					"dev": true,
 					"requires": {
@@ -5443,6 +5713,21 @@
 					"bundled": true,
 					"dev": true
 				},
+				"is-accessor-descriptor": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"kind-of": "6.0.2"
+					},
+					"dependencies": {
+						"kind-of": {
+							"version": "6.0.2",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"is-arrayish": {
 					"version": "0.2.1",
 					"bundled": true,
@@ -5461,21 +5746,53 @@
 						"builtin-modules": "1.1.1"
 					}
 				},
-				"is-dotfile": {
-					"version": "1.0.3",
-					"bundled": true,
-					"dev": true
-				},
-				"is-equal-shallow": {
-					"version": "0.1.3",
+				"is-data-descriptor": {
+					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"is-primitive": "2.0.0"
-					}
-				},
-				"is-extendable": {
-					"version": "0.1.1",
+						"kind-of": "6.0.2"
+					},
+					"dependencies": {
+						"kind-of": {
+							"version": "6.0.2",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"is-descriptor": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-accessor-descriptor": "1.0.0",
+						"is-data-descriptor": "1.0.0",
+						"kind-of": "6.0.2"
+					},
+					"dependencies": {
+						"kind-of": {
+							"version": "6.0.2",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"is-dotfile": {
+					"version": "1.0.3",
+					"bundled": true,
+					"dev": true
+				},
+				"is-equal-shallow": {
+					"version": "0.1.3",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-primitive": "2.0.0"
+					}
+				},
+				"is-extendable": {
+					"version": "0.1.1",
 					"bundled": true,
 					"dev": true
 				},
@@ -5493,12 +5810,9 @@
 					}
 				},
 				"is-fullwidth-code-point": {
-					"version": "1.0.0",
+					"version": "2.0.0",
 					"bundled": true,
-					"dev": true,
-					"requires": {
-						"number-is-nan": "1.0.1"
-					}
+					"dev": true
 				},
 				"is-glob": {
 					"version": "2.0.1",
@@ -5516,6 +5830,36 @@
 						"kind-of": "3.2.2"
 					}
 				},
+				"is-odd": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-number": "4.0.0"
+					},
+					"dependencies": {
+						"is-number": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"is-plain-object": {
+					"version": "2.0.4",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"isobject": "3.0.1"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"is-posix-bracket": {
 					"version": "0.1.1",
 					"bundled": true,
@@ -5536,6 +5880,11 @@
 					"bundled": true,
 					"dev": true
 				},
+				"is-windows": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true
+				},
 				"isarray": {
 					"version": "1.0.0",
 					"bundled": true,
@@ -5555,7 +5904,7 @@
 					}
 				},
 				"istanbul-lib-coverage": {
-					"version": "1.1.1",
+					"version": "1.2.0",
 					"bundled": true,
 					"dev": true
 				},
@@ -5568,25 +5917,25 @@
 					}
 				},
 				"istanbul-lib-instrument": {
-					"version": "1.9.1",
+					"version": "1.10.1",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"babel-generator": "6.26.0",
+						"babel-generator": "6.26.1",
 						"babel-template": "6.26.0",
 						"babel-traverse": "6.26.0",
 						"babel-types": "6.26.0",
 						"babylon": "6.18.0",
-						"istanbul-lib-coverage": "1.1.1",
-						"semver": "5.4.1"
+						"istanbul-lib-coverage": "1.2.0",
+						"semver": "5.5.0"
 					}
 				},
 				"istanbul-lib-report": {
-					"version": "1.1.2",
+					"version": "1.1.3",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"istanbul-lib-coverage": "1.1.1",
+						"istanbul-lib-coverage": "1.2.0",
 						"mkdirp": "0.5.1",
 						"path-parse": "1.0.5",
 						"supports-color": "3.2.3"
@@ -5603,12 +5952,12 @@
 					}
 				},
 				"istanbul-lib-source-maps": {
-					"version": "1.2.2",
+					"version": "1.2.3",
 					"bundled": true,
 					"dev": true,
 					"requires": {
 						"debug": "3.1.0",
-						"istanbul-lib-coverage": "1.1.1",
+						"istanbul-lib-coverage": "1.2.0",
 						"mkdirp": "0.5.1",
 						"rimraf": "2.6.2",
 						"source-map": "0.5.7"
@@ -5625,7 +5974,7 @@
 					}
 				},
 				"istanbul-reports": {
-					"version": "1.1.3",
+					"version": "1.3.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
@@ -5693,7 +6042,7 @@
 					}
 				},
 				"lodash": {
-					"version": "4.17.4",
+					"version": "4.17.5",
 					"bundled": true,
 					"dev": true
 				},
@@ -5711,7 +6060,7 @@
 					}
 				},
 				"lru-cache": {
-					"version": "4.1.1",
+					"version": "4.1.2",
 					"bundled": true,
 					"dev": true,
 					"requires": {
@@ -5719,6 +6068,19 @@
 						"yallist": "2.1.2"
 					}
 				},
+				"map-cache": {
+					"version": "0.2.2",
+					"bundled": true,
+					"dev": true
+				},
+				"map-visit": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"object-visit": "1.0.1"
+					}
+				},
 				"md5-hex": {
 					"version": "1.3.0",
 					"bundled": true,
@@ -5737,15 +6099,22 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"mimic-fn": "1.1.0"
+						"mimic-fn": "1.2.0"
 					}
 				},
 				"merge-source-map": {
-					"version": "1.0.4",
+					"version": "1.1.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"source-map": "0.5.7"
+						"source-map": "0.6.1"
+					},
+					"dependencies": {
+						"source-map": {
+							"version": "0.6.1",
+							"bundled": true,
+							"dev": true
+						}
 					}
 				},
 				"micromatch": {
@@ -5769,7 +6138,7 @@
 					}
 				},
 				"mimic-fn": {
-					"version": "1.1.0",
+					"version": "1.2.0",
 					"bundled": true,
 					"dev": true
 				},
@@ -5778,7 +6147,7 @@
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"brace-expansion": "1.1.8"
+						"brace-expansion": "1.1.11"
 					}
 				},
 				"minimist": {
@@ -5786,6 +6155,25 @@
 					"bundled": true,
 					"dev": true
 				},
+				"mixin-deep": {
+					"version": "1.3.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"for-in": "1.0.2",
+						"is-extendable": "1.0.1"
+					},
+					"dependencies": {
+						"is-extendable": {
+							"version": "1.0.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-plain-object": "2.0.4"
+							}
+						}
+					}
+				},
 				"mkdirp": {
 					"version": "0.5.1",
 					"bundled": true,
@@ -5799,15 +6187,51 @@
 					"bundled": true,
 					"dev": true
 				},
+				"nanomatch": {
+					"version": "1.2.9",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"arr-diff": "4.0.0",
+						"array-unique": "0.3.2",
+						"define-property": "2.0.2",
+						"extend-shallow": "3.0.2",
+						"fragment-cache": "0.2.1",
+						"is-odd": "2.0.0",
+						"is-windows": "1.0.2",
+						"kind-of": "6.0.2",
+						"object.pick": "1.3.0",
+						"regex-not": "1.0.2",
+						"snapdragon": "0.8.2",
+						"to-regex": "3.0.2"
+					},
+					"dependencies": {
+						"arr-diff": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true
+						},
+						"array-unique": {
+							"version": "0.3.2",
+							"bundled": true,
+							"dev": true
+						},
+						"kind-of": {
+							"version": "6.0.2",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"normalize-package-data": {
 					"version": "2.4.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"hosted-git-info": "2.5.0",
+						"hosted-git-info": "2.6.0",
 						"is-builtin-module": "1.0.0",
-						"semver": "5.4.1",
-						"validate-npm-package-license": "3.0.1"
+						"semver": "5.5.0",
+						"validate-npm-package-license": "3.0.3"
 					}
 				},
 				"normalize-path": {
@@ -5836,6 +6260,74 @@
 					"bundled": true,
 					"dev": true
 				},
+				"object-copy": {
+					"version": "0.1.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"copy-descriptor": "0.1.1",
+						"define-property": "0.2.5",
+						"kind-of": "3.2.2"
+					},
+					"dependencies": {
+						"define-property": {
+							"version": "0.2.5",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-descriptor": "0.1.6"
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							}
+						},
+						"is-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-accessor-descriptor": "0.1.6",
+								"is-data-descriptor": "0.1.4",
+								"kind-of": "5.1.0"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "5.1.0",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						}
+					}
+				},
+				"object-visit": {
+					"version": "1.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"isobject": "3.0.1"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"object.omit": {
 					"version": "2.0.1",
 					"bundled": true,
@@ -5845,6 +6337,21 @@
 						"is-extendable": "0.1.1"
 					}
 				},
+				"object.pick": {
+					"version": "1.3.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"isobject": "3.0.1"
+					},
+					"dependencies": {
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"once": {
 					"version": "1.4.0",
 					"bundled": true,
@@ -5883,18 +6390,26 @@
 					"dev": true
 				},
 				"p-limit": {
-					"version": "1.1.0",
+					"version": "1.2.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"requires": {
+						"p-try": "1.0.0"
+					}
 				},
 				"p-locate": {
 					"version": "2.0.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"p-limit": "1.1.0"
+						"p-limit": "1.2.0"
 					}
 				},
+				"p-try": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
 				"parse-glob": {
 					"version": "3.0.4",
 					"bundled": true,
@@ -5914,6 +6429,11 @@
 						"error-ex": "1.3.1"
 					}
 				},
+				"pascalcase": {
+					"version": "0.1.1",
+					"bundled": true,
+					"dev": true
+				},
 				"path-exists": {
 					"version": "2.1.0",
 					"bundled": true,
@@ -5984,6 +6504,11 @@
 						}
 					}
 				},
+				"posix-character-classes": {
+					"version": "0.1.1",
+					"bundled": true,
+					"dev": true
+				},
 				"preserve": {
 					"version": "0.2.0",
 					"bundled": true,
@@ -6074,6 +6599,15 @@
 						"is-equal-shallow": "0.1.3"
 					}
 				},
+				"regex-not": {
+					"version": "1.0.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"extend-shallow": "3.0.2",
+						"safe-regex": "1.1.0"
+					}
+				},
 				"remove-trailing-separator": {
 					"version": "1.1.0",
 					"bundled": true,
@@ -6112,6 +6646,16 @@
 					"bundled": true,
 					"dev": true
 				},
+				"resolve-url": {
+					"version": "0.2.1",
+					"bundled": true,
+					"dev": true
+				},
+				"ret": {
+					"version": "0.1.15",
+					"bundled": true,
+					"dev": true
+				},
 				"right-align": {
 					"version": "0.1.3",
 					"bundled": true,
@@ -6129,147 +6673,665 @@
 						"glob": "7.1.2"
 					}
 				},
-				"semver": {
-					"version": "5.4.1",
-					"bundled": true,
-					"dev": true
-				},
-				"set-blocking": {
-					"version": "2.0.0",
+				"safe-regex": {
+					"version": "1.1.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"ret": "0.1.15"
+					}
+				},
+				"semver": {
+					"version": "5.5.0",
+					"bundled": true,
+					"dev": true
+				},
+				"set-blocking": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"set-value": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"extend-shallow": "2.0.1",
+						"is-extendable": "0.1.1",
+						"is-plain-object": "2.0.4",
+						"split-string": "3.1.0"
+					},
+					"dependencies": {
+						"extend-shallow": {
+							"version": "2.0.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-extendable": "0.1.1"
+							}
+						}
+					}
+				},
+				"shebang-command": {
+					"version": "1.2.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"shebang-regex": "1.0.0"
+					}
+				},
+				"shebang-regex": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"signal-exit": {
+					"version": "3.0.2",
+					"bundled": true,
+					"dev": true
+				},
+				"slide": {
+					"version": "1.1.6",
+					"bundled": true,
+					"dev": true
+				},
+				"snapdragon": {
+					"version": "0.8.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"base": "0.11.2",
+						"debug": "2.6.9",
+						"define-property": "0.2.5",
+						"extend-shallow": "2.0.1",
+						"map-cache": "0.2.2",
+						"source-map": "0.5.7",
+						"source-map-resolve": "0.5.1",
+						"use": "3.1.0"
+					},
+					"dependencies": {
+						"define-property": {
+							"version": "0.2.5",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-descriptor": "0.1.6"
+							}
+						},
+						"extend-shallow": {
+							"version": "2.0.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-extendable": "0.1.1"
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-accessor-descriptor": "0.1.6",
+								"is-data-descriptor": "0.1.4",
+								"kind-of": "5.1.0"
+							}
+						},
+						"kind-of": {
+							"version": "5.1.0",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"snapdragon-node": {
+					"version": "2.1.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"define-property": "1.0.0",
+						"isobject": "3.0.1",
+						"snapdragon-util": "3.0.1"
+					},
+					"dependencies": {
+						"define-property": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-descriptor": "1.0.2"
+							}
+						},
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"snapdragon-util": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"kind-of": "3.2.2"
+					}
+				},
+				"source-map": {
+					"version": "0.5.7",
+					"bundled": true,
+					"dev": true
+				},
+				"source-map-resolve": {
+					"version": "0.5.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"atob": "2.0.3",
+						"decode-uri-component": "0.2.0",
+						"resolve-url": "0.2.1",
+						"source-map-url": "0.4.0",
+						"urix": "0.1.0"
+					}
+				},
+				"source-map-url": {
+					"version": "0.4.0",
+					"bundled": true,
+					"dev": true
+				},
+				"spawn-wrap": {
+					"version": "1.4.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"foreground-child": "1.5.6",
+						"mkdirp": "0.5.1",
+						"os-homedir": "1.0.2",
+						"rimraf": "2.6.2",
+						"signal-exit": "3.0.2",
+						"which": "1.3.0"
+					}
+				},
+				"spdx-correct": {
+					"version": "3.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"spdx-expression-parse": "3.0.0",
+						"spdx-license-ids": "3.0.0"
+					}
+				},
+				"spdx-exceptions": {
+					"version": "2.1.0",
+					"bundled": true,
+					"dev": true
+				},
+				"spdx-expression-parse": {
+					"version": "3.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"spdx-exceptions": "2.1.0",
+						"spdx-license-ids": "3.0.0"
+					}
+				},
+				"spdx-license-ids": {
+					"version": "3.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"split-string": {
+					"version": "3.1.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"extend-shallow": "3.0.2"
+					}
+				},
+				"static-extend": {
+					"version": "0.1.2",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"define-property": "0.2.5",
+						"object-copy": "0.1.0"
+					},
+					"dependencies": {
+						"define-property": {
+							"version": "0.2.5",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-descriptor": "0.1.6"
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-accessor-descriptor": "0.1.6",
+								"is-data-descriptor": "0.1.4",
+								"kind-of": "5.1.0"
+							}
+						},
+						"kind-of": {
+							"version": "5.1.0",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"string-width": {
+					"version": "2.1.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-fullwidth-code-point": "2.0.0",
+						"strip-ansi": "4.0.0"
+					},
+					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"bundled": true,
+							"dev": true
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"ansi-regex": "3.0.0"
+							}
+						}
+					}
+				},
+				"strip-ansi": {
+					"version": "3.0.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"ansi-regex": "2.1.1"
+					}
+				},
+				"strip-bom": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"is-utf8": "0.2.1"
+					}
+				},
+				"strip-eof": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"supports-color": {
+					"version": "2.0.0",
+					"bundled": true,
+					"dev": true
+				},
+				"test-exclude": {
+					"version": "4.2.1",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"arrify": "1.0.1",
+						"micromatch": "3.1.9",
+						"object-assign": "4.1.1",
+						"read-pkg-up": "1.0.1",
+						"require-main-filename": "1.0.1"
+					},
+					"dependencies": {
+						"arr-diff": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true
+						},
+						"array-unique": {
+							"version": "0.3.2",
+							"bundled": true,
+							"dev": true
+						},
+						"braces": {
+							"version": "2.3.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"arr-flatten": "1.1.0",
+								"array-unique": "0.3.2",
+								"define-property": "1.0.0",
+								"extend-shallow": "2.0.1",
+								"fill-range": "4.0.0",
+								"isobject": "3.0.1",
+								"kind-of": "6.0.2",
+								"repeat-element": "1.1.2",
+								"snapdragon": "0.8.2",
+								"snapdragon-node": "2.1.1",
+								"split-string": "3.1.0",
+								"to-regex": "3.0.2"
+							},
+							"dependencies": {
+								"define-property": {
+									"version": "1.0.0",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-descriptor": "1.0.2"
+									}
+								},
+								"extend-shallow": {
+									"version": "2.0.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-extendable": "0.1.1"
+									}
+								}
+							}
+						},
+						"expand-brackets": {
+							"version": "2.1.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"debug": "2.6.9",
+								"define-property": "0.2.5",
+								"extend-shallow": "2.0.1",
+								"posix-character-classes": "0.1.1",
+								"regex-not": "1.0.2",
+								"snapdragon": "0.8.2",
+								"to-regex": "3.0.2"
+							},
+							"dependencies": {
+								"define-property": {
+									"version": "0.2.5",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-descriptor": "0.1.6"
+									}
+								},
+								"extend-shallow": {
+									"version": "2.0.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-extendable": "0.1.1"
+									}
+								},
+								"is-descriptor": {
+									"version": "0.1.6",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-accessor-descriptor": "0.1.6",
+										"is-data-descriptor": "0.1.4",
+										"kind-of": "5.1.0"
+									}
+								},
+								"kind-of": {
+									"version": "5.1.0",
+									"bundled": true,
+									"dev": true
+								}
+							}
+						},
+						"extglob": {
+							"version": "2.0.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"array-unique": "0.3.2",
+								"define-property": "1.0.0",
+								"expand-brackets": "2.1.4",
+								"extend-shallow": "2.0.1",
+								"fragment-cache": "0.2.1",
+								"regex-not": "1.0.2",
+								"snapdragon": "0.8.2",
+								"to-regex": "3.0.2"
+							},
+							"dependencies": {
+								"define-property": {
+									"version": "1.0.0",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-descriptor": "1.0.2"
+									}
+								},
+								"extend-shallow": {
+									"version": "2.0.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-extendable": "0.1.1"
+									}
+								}
+							}
+						},
+						"fill-range": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"extend-shallow": "2.0.1",
+								"is-number": "3.0.0",
+								"repeat-string": "1.6.1",
+								"to-regex-range": "2.1.1"
+							},
+							"dependencies": {
+								"extend-shallow": {
+									"version": "2.0.1",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-extendable": "0.1.1"
+									}
+								}
+							}
+						},
+						"is-accessor-descriptor": {
+							"version": "0.1.6",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-data-descriptor": {
+							"version": "0.1.4",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"is-number": {
+							"version": "3.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"kind-of": "3.2.2"
+							},
+							"dependencies": {
+								"kind-of": {
+									"version": "3.2.2",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"is-buffer": "1.1.6"
+									}
+								}
+							}
+						},
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						},
+						"kind-of": {
+							"version": "6.0.2",
+							"bundled": true,
+							"dev": true
+						},
+						"micromatch": {
+							"version": "3.1.9",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"arr-diff": "4.0.0",
+								"array-unique": "0.3.2",
+								"braces": "2.3.1",
+								"define-property": "2.0.2",
+								"extend-shallow": "3.0.2",
+								"extglob": "2.0.4",
+								"fragment-cache": "0.2.1",
+								"kind-of": "6.0.2",
+								"nanomatch": "1.2.9",
+								"object.pick": "1.3.0",
+								"regex-not": "1.0.2",
+								"snapdragon": "0.8.2",
+								"to-regex": "3.0.2"
+							}
+						}
+					}
+				},
+				"to-fast-properties": {
+					"version": "1.0.3",
 					"bundled": true,
 					"dev": true
 				},
-				"shebang-command": {
-					"version": "1.2.0",
+				"to-object-path": {
+					"version": "0.3.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"shebang-regex": "1.0.0"
+						"kind-of": "3.2.2"
 					}
 				},
-				"shebang-regex": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"signal-exit": {
+				"to-regex": {
 					"version": "3.0.2",
 					"bundled": true,
-					"dev": true
-				},
-				"slide": {
-					"version": "1.1.6",
-					"bundled": true,
-					"dev": true
-				},
-				"source-map": {
-					"version": "0.5.7",
-					"bundled": true,
-					"dev": true
-				},
-				"spawn-wrap": {
-					"version": "1.4.2",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"foreground-child": "1.5.6",
-						"mkdirp": "0.5.1",
-						"os-homedir": "1.0.2",
-						"rimraf": "2.6.2",
-						"signal-exit": "3.0.2",
-						"which": "1.3.0"
-					}
-				},
-				"spdx-correct": {
-					"version": "1.0.2",
-					"bundled": true,
 					"dev": true,
 					"requires": {
-						"spdx-license-ids": "1.2.2"
+						"define-property": "2.0.2",
+						"extend-shallow": "3.0.2",
+						"regex-not": "1.0.2",
+						"safe-regex": "1.1.0"
 					}
 				},
-				"spdx-expression-parse": {
-					"version": "1.0.4",
-					"bundled": true,
-					"dev": true
-				},
-				"spdx-license-ids": {
-					"version": "1.2.2",
-					"bundled": true,
-					"dev": true
-				},
-				"string-width": {
+				"to-regex-range": {
 					"version": "2.1.1",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"is-fullwidth-code-point": "2.0.0",
-						"strip-ansi": "4.0.0"
+						"is-number": "3.0.0",
+						"repeat-string": "1.6.1"
 					},
 					"dependencies": {
-						"ansi-regex": {
+						"is-number": {
 							"version": "3.0.0",
 							"bundled": true,
-							"dev": true
-						},
-						"is-fullwidth-code-point": {
-							"version": "2.0.0",
-							"bundled": true,
-							"dev": true
-						},
-						"strip-ansi": {
-							"version": "4.0.0",
-							"bundled": true,
 							"dev": true,
 							"requires": {
-								"ansi-regex": "3.0.0"
+								"kind-of": "3.2.2"
 							}
 						}
 					}
 				},
-				"strip-ansi": {
-					"version": "3.0.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"ansi-regex": "2.1.1"
-					}
-				},
-				"strip-bom": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"is-utf8": "0.2.1"
-					}
-				},
-				"strip-eof": {
-					"version": "1.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"supports-color": {
-					"version": "2.0.0",
-					"bundled": true,
-					"dev": true
-				},
-				"test-exclude": {
-					"version": "4.1.1",
-					"bundled": true,
-					"dev": true,
-					"requires": {
-						"arrify": "1.0.1",
-						"micromatch": "2.3.11",
-						"object-assign": "4.1.1",
-						"read-pkg-up": "1.0.1",
-						"require-main-filename": "1.0.1"
-					}
-				},
-				"to-fast-properties": {
-					"version": "1.0.3",
-					"bundled": true,
-					"dev": true
-				},
 				"trim-right": {
 					"version": "1.0.1",
 					"bundled": true,
@@ -6306,13 +7368,106 @@
 					"dev": true,
 					"optional": true
 				},
+				"union-value": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"arr-union": "3.1.0",
+						"get-value": "2.0.6",
+						"is-extendable": "0.1.1",
+						"set-value": "0.4.3"
+					},
+					"dependencies": {
+						"extend-shallow": {
+							"version": "2.0.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"is-extendable": "0.1.1"
+							}
+						},
+						"set-value": {
+							"version": "0.4.3",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"extend-shallow": "2.0.1",
+								"is-extendable": "0.1.1",
+								"is-plain-object": "2.0.4",
+								"to-object-path": "0.3.0"
+							}
+						}
+					}
+				},
+				"unset-value": {
+					"version": "1.0.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"has-value": "0.3.1",
+						"isobject": "3.0.1"
+					},
+					"dependencies": {
+						"has-value": {
+							"version": "0.3.1",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"get-value": "2.0.6",
+								"has-values": "0.1.4",
+								"isobject": "2.1.0"
+							},
+							"dependencies": {
+								"isobject": {
+									"version": "2.1.0",
+									"bundled": true,
+									"dev": true,
+									"requires": {
+										"isarray": "1.0.0"
+									}
+								}
+							}
+						},
+						"has-values": {
+							"version": "0.1.4",
+							"bundled": true,
+							"dev": true
+						},
+						"isobject": {
+							"version": "3.0.1",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
+				"urix": {
+					"version": "0.1.0",
+					"bundled": true,
+					"dev": true
+				},
+				"use": {
+					"version": "3.1.0",
+					"bundled": true,
+					"dev": true,
+					"requires": {
+						"kind-of": "6.0.2"
+					},
+					"dependencies": {
+						"kind-of": {
+							"version": "6.0.2",
+							"bundled": true,
+							"dev": true
+						}
+					}
+				},
 				"validate-npm-package-license": {
-					"version": "3.0.1",
+					"version": "3.0.3",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"spdx-correct": "1.0.2",
-						"spdx-expression-parse": "1.0.4"
+						"spdx-correct": "3.0.0",
+						"spdx-expression-parse": "3.0.0"
 					}
 				},
 				"which": {
@@ -6348,6 +7503,14 @@
 						"strip-ansi": "3.0.1"
 					},
 					"dependencies": {
+						"is-fullwidth-code-point": {
+							"version": "1.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"number-is-nan": "1.0.1"
+							}
+						},
 						"string-width": {
 							"version": "1.0.2",
 							"bundled": true,
@@ -6386,11 +7549,11 @@
 					"dev": true
 				},
 				"yargs": {
-					"version": "10.0.3",
+					"version": "11.1.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
-						"cliui": "3.2.0",
+						"cliui": "4.0.0",
 						"decamelize": "1.2.0",
 						"find-up": "2.1.0",
 						"get-caller-file": "1.0.2",
@@ -6401,35 +7564,49 @@
 						"string-width": "2.1.1",
 						"which-module": "2.0.0",
 						"y18n": "3.2.1",
-						"yargs-parser": "8.0.0"
+						"yargs-parser": "9.0.2"
 					},
 					"dependencies": {
+						"ansi-regex": {
+							"version": "3.0.0",
+							"bundled": true,
+							"dev": true
+						},
+						"camelcase": {
+							"version": "4.1.0",
+							"bundled": true,
+							"dev": true
+						},
 						"cliui": {
-							"version": "3.2.0",
+							"version": "4.0.0",
 							"bundled": true,
 							"dev": true,
 							"requires": {
-								"string-width": "1.0.2",
-								"strip-ansi": "3.0.1",
+								"string-width": "2.1.1",
+								"strip-ansi": "4.0.0",
 								"wrap-ansi": "2.1.0"
-							},
-							"dependencies": {
-								"string-width": {
-									"version": "1.0.2",
-									"bundled": true,
-									"dev": true,
-									"requires": {
-										"code-point-at": "1.1.0",
-										"is-fullwidth-code-point": "1.0.0",
-										"strip-ansi": "3.0.1"
-									}
-								}
+							}
+						},
+						"strip-ansi": {
+							"version": "4.0.0",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"ansi-regex": "3.0.0"
+							}
+						},
+						"yargs-parser": {
+							"version": "9.0.2",
+							"bundled": true,
+							"dev": true,
+							"requires": {
+								"camelcase": "4.1.0"
 							}
 						}
 					}
 				},
 				"yargs-parser": {
-					"version": "8.0.0",
+					"version": "8.1.0",
 					"bundled": true,
 					"dev": true,
 					"requires": {
@@ -6878,12 +8055,6 @@
 			"integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
 			"dev": true
 		},
-		"prettier": {
-			"version": "1.11.1",
-			"resolved": "https://registry.npmjs.org/prettier/-/prettier-1.11.1.tgz",
-			"integrity": "sha512-T/KD65Ot0PB97xTrG8afQ46x3oiVhnfGjGESSI9NWYcG92+OUPZKkwHqGWXH2t9jK1crnQjubECW0FuOth+hxw==",
-			"dev": true
-		},
 		"pretty-format": {
 			"version": "22.4.0",
 			"resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-22.4.0.tgz",
diff --git a/yarn.lock b/yarn.lock
index 75ca6cd..4015b1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -563,6 +563,14 @@ cliui@^3.2.0:
     strip-ansi "^3.0.1"
     wrap-ansi "^2.0.0"
 
+cliui@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-4.0.0.tgz#743d4650e05f36d1ed2575b59638d87322bfbbcc"
+  dependencies:
+    string-width "^2.1.1"
+    strip-ansi "^4.0.0"
+    wrap-ansi "^2.0.0"
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -618,10 +626,14 @@ content-type-parser@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.1.tgz#c3e56988c53c65127fb46d4032a3a900246fdc94"
 
-convert-source-map@^1.3.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0:
+convert-source-map@^1.4.0, convert-source-map@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.0.tgz#9acd70851c6d5dfdd93d9282e5edf94a03ff46b5"
 
+convert-source-map@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
+
 copy-descriptor@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
@@ -1656,12 +1668,28 @@ istanbul-lib-coverage@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
 
+istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341"
+
 istanbul-lib-hook@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
   dependencies:
     append-transform "^0.4.0"
 
+istanbul-lib-instrument@^1.10.0:
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b"
+  dependencies:
+    babel-generator "^6.18.0"
+    babel-template "^6.16.0"
+    babel-traverse "^6.18.0"
+    babel-types "^6.18.0"
+    babylon "^6.18.0"
+    istanbul-lib-coverage "^1.2.0"
+    semver "^5.3.0"
+
 istanbul-lib-instrument@^1.7.5, istanbul-lib-instrument@^1.8.0, istanbul-lib-instrument@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
@@ -1683,6 +1711,15 @@ istanbul-lib-report@^1.1.2:
     path-parse "^1.0.5"
     supports-color "^3.1.2"
 
+istanbul-lib-report@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.3.tgz#2df12188c0fa77990c0d2176d2d0ba3394188259"
+  dependencies:
+    istanbul-lib-coverage "^1.1.2"
+    mkdirp "^0.5.1"
+    path-parse "^1.0.5"
+    supports-color "^3.1.2"
+
 istanbul-lib-source-maps@^1.2.1, istanbul-lib-source-maps@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
@@ -1693,12 +1730,28 @@ istanbul-lib-source-maps@^1.2.1, istanbul-lib-source-maps@^1.2.2:
     rimraf "^2.6.1"
     source-map "^0.5.3"
 
+istanbul-lib-source-maps@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6"
+  dependencies:
+    debug "^3.1.0"
+    istanbul-lib-coverage "^1.1.2"
+    mkdirp "^0.5.1"
+    rimraf "^2.6.1"
+    source-map "^0.5.3"
+
 istanbul-reports@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10"
   dependencies:
     handlebars "^4.0.3"
 
+istanbul-reports@^1.1.4:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.3.0.tgz#2f322e81e1d9520767597dca3c20a0cce89a3554"
+  dependencies:
+    handlebars "^4.0.3"
+
 jest-changed-files@^22.2.0:
   version "22.2.0"
   resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.2.0.tgz#517610c4a8ca0925bdc88b0ca53bd678aa8d019e"
@@ -2485,25 +2538,25 @@ nwmatcher@^1.4.3:
   resolved "https://registry.yarnpkg.com/nwmatcher/-/nwmatcher-1.4.3.tgz#64348e3b3d80f035b40ac11563d278f8b72db89c"
 
 nyc@^11.4.1:
-  version "11.4.1"
-  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.4.1.tgz#13fdf7e7ef22d027c61d174758f6978a68f4f5e5"
+  version "11.6.0"
+  resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.6.0.tgz#d9c7b51ffceb6bba099a4683a6adc1b331b98853"
   dependencies:
     archy "^1.0.0"
     arrify "^1.0.1"
     caching-transform "^1.0.0"
-    convert-source-map "^1.3.0"
+    convert-source-map "^1.5.1"
     debug-log "^1.0.1"
     default-require-extensions "^1.0.0"
     find-cache-dir "^0.1.1"
     find-up "^2.1.0"
     foreground-child "^1.5.3"
     glob "^7.0.6"
-    istanbul-lib-coverage "^1.1.1"
+    istanbul-lib-coverage "^1.1.2"
     istanbul-lib-hook "^1.1.0"
-    istanbul-lib-instrument "^1.9.1"
-    istanbul-lib-report "^1.1.2"
-    istanbul-lib-source-maps "^1.2.2"
-    istanbul-reports "^1.1.3"
+    istanbul-lib-instrument "^1.10.0"
+    istanbul-lib-report "^1.1.3"
+    istanbul-lib-source-maps "^1.2.3"
+    istanbul-reports "^1.1.4"
     md5-hex "^1.2.0"
     merge-source-map "^1.0.2"
     micromatch "^2.3.11"
@@ -2512,8 +2565,8 @@ nyc@^11.4.1:
     rimraf "^2.5.4"
     signal-exit "^3.0.1"
     spawn-wrap "^1.4.2"
-    test-exclude "^4.1.1"
-    yargs "^10.0.3"
+    test-exclude "^4.2.0"
+    yargs "11.1.0"
     yargs-parser "^8.0.0"
 
 oauth-sign@~0.8.1, oauth-sign@~0.8.2:
@@ -3276,7 +3329,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-string-width@^2.0.0:
+string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   dependencies:
@@ -3394,6 +3447,16 @@ test-exclude@^4.1.1:
     read-pkg-up "^1.0.1"
     require-main-filename "^1.0.1"
 
+test-exclude@^4.2.0:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.2.1.tgz#dfa222f03480bca69207ca728b37d74b45f724fa"
+  dependencies:
+    arrify "^1.0.1"
+    micromatch "^3.1.8"
+    object-assign "^4.1.0"
+    read-pkg-up "^1.0.1"
+    require-main-filename "^1.0.1"
+
 throat@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-4.1.0.tgz#89037cbc92c56ab18926e6ba4cbb200e15672a6a"
@@ -3642,6 +3705,29 @@ yargs-parser@^8.0.0:
   dependencies:
     camelcase "^4.1.0"
 
+yargs-parser@^9.0.2:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077"
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@11.1.0:
+  version "11.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77"
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^1.1.1"
+    find-up "^2.1.0"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^9.0.2"
+
 yargs@^10.0.3:
   version "10.0.3"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae"