diff --git a/package-lock.json b/package-lock.json
index 550bafe..2b2ec42 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
 	"name": "Merlin-WP",
-	"version": "1.0.0-rc.1",
+	"version": "1.0.0",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -1942,7 +1942,8 @@
 				"ansi-regex": {
 					"version": "2.1.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"aproba": {
 					"version": "1.1.1",
@@ -1993,7 +1994,8 @@
 				"balanced-match": {
 					"version": "0.4.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"bcrypt-pbkdf": {
 					"version": "1.0.1",
@@ -2008,6 +2010,7 @@
 					"version": "0.0.9",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"inherits": "2.0.3"
 					}
@@ -2016,6 +2019,7 @@
 					"version": "2.10.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"hoek": "2.16.3"
 					}
@@ -2024,6 +2028,7 @@
 					"version": "1.1.7",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"balanced-match": "0.4.2",
 						"concat-map": "0.0.1"
@@ -2032,7 +2037,8 @@
 				"buffer-shims": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"caseless": {
 					"version": "0.12.0",
@@ -2049,12 +2055,14 @@
 				"code-point-at": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"combined-stream": {
 					"version": "1.0.5",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"delayed-stream": "1.0.0"
 					}
@@ -2062,22 +2070,26 @@
 				"concat-map": {
 					"version": "0.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"console-control-strings": {
 					"version": "1.1.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"core-util-is": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"cryptiles": {
 					"version": "2.0.5",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"boom": "2.10.1"
 					}
@@ -2117,7 +2129,8 @@
 				"delayed-stream": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"delegates": {
 					"version": "1.0.0",
@@ -2149,7 +2162,8 @@
 				"extsprintf": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"forever-agent": {
 					"version": "0.6.1",
@@ -2171,12 +2185,14 @@
 				"fs.realpath": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"fstream": {
 					"version": "1.0.11",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"graceful-fs": "4.1.11",
 						"inherits": "2.0.3",
@@ -2232,6 +2248,7 @@
 					"version": "7.1.2",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"fs.realpath": "1.0.0",
 						"inflight": "1.0.6",
@@ -2244,7 +2261,8 @@
 				"graceful-fs": {
 					"version": "4.1.11",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"har-schema": {
 					"version": "1.0.5",
@@ -2272,6 +2290,7 @@
 					"version": "3.1.3",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"boom": "2.10.1",
 						"cryptiles": "2.0.5",
@@ -2282,7 +2301,8 @@
 				"hoek": {
 					"version": "2.16.3",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"http-signature": {
 					"version": "1.1.1",
@@ -2299,6 +2319,7 @@
 					"version": "1.0.6",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"once": "1.4.0",
 						"wrappy": "1.0.2"
@@ -2307,7 +2328,8 @@
 				"inherits": {
 					"version": "2.0.3",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"ini": {
 					"version": "1.3.4",
@@ -2319,6 +2341,7 @@
 					"version": "1.0.0",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"number-is-nan": "1.0.1"
 					}
@@ -2332,7 +2355,8 @@
 				"isarray": {
 					"version": "1.0.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"isstream": {
 					"version": "0.1.2",
@@ -2405,12 +2429,14 @@
 				"mime-db": {
 					"version": "1.27.0",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"mime-types": {
 					"version": "2.1.15",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"mime-db": "1.27.0"
 					}
@@ -2419,22 +2445,17 @@
 					"version": "3.0.4",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"brace-expansion": "1.1.7"
 					}
 				},
 				"minimist": {
-					"version": "0.0.8",
-					"bundled": true,
-					"dev": true
-				},
-				"mkdirp": {
-					"version": "0.5.1",
-					"bundled": true,
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
 					"dev": true,
-					"requires": {
-						"minimist": "0.0.8"
-					}
+					"optional": true
 				},
 				"ms": {
 					"version": "2.0.0",
@@ -2486,7 +2507,8 @@
 				"number-is-nan": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"oauth-sign": {
 					"version": "0.8.2",
@@ -2504,6 +2526,7 @@
 					"version": "1.4.0",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"wrappy": "1.0.2"
 					}
@@ -2533,7 +2556,8 @@
 				"path-is-absolute": {
 					"version": "1.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"performance-now": {
 					"version": "0.2.0",
@@ -2544,7 +2568,8 @@
 				"process-nextick-args": {
 					"version": "1.0.7",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"punycode": {
 					"version": "1.4.1",
@@ -2568,20 +2593,13 @@
 						"ini": "1.3.4",
 						"minimist": "1.2.0",
 						"strip-json-comments": "2.0.1"
-					},
-					"dependencies": {
-						"minimist": {
-							"version": "1.2.0",
-							"bundled": true,
-							"dev": true,
-							"optional": true
-						}
 					}
 				},
 				"readable-stream": {
 					"version": "2.2.9",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"buffer-shims": "1.0.0",
 						"core-util-is": "1.0.2",
@@ -2626,6 +2644,7 @@
 					"version": "2.6.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"glob": "7.1.2"
 					}
@@ -2633,7 +2652,8 @@
 				"safe-buffer": {
 					"version": "5.0.1",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"semver": {
 					"version": "5.3.0",
@@ -2657,6 +2677,7 @@
 					"version": "1.0.9",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"hoek": "2.16.3"
 					}
@@ -2690,6 +2711,7 @@
 					"version": "1.0.2",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"code-point-at": "1.1.0",
 						"is-fullwidth-code-point": "1.0.0",
@@ -2700,6 +2722,7 @@
 					"version": "1.0.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"safe-buffer": "5.0.1"
 					}
@@ -2714,6 +2737,7 @@
 					"version": "3.0.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"ansi-regex": "2.1.1"
 					}
@@ -2728,6 +2752,7 @@
 					"version": "2.2.1",
 					"bundled": true,
 					"dev": true,
+					"optional": true,
 					"requires": {
 						"block-stream": "0.0.9",
 						"fstream": "1.0.11",
@@ -2783,7 +2808,8 @@
 				"util-deprecate": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				},
 				"uuid": {
 					"version": "3.0.1",
@@ -2812,7 +2838,8 @@
 				"wrappy": {
 					"version": "1.0.2",
 					"bundled": true,
-					"dev": true
+					"dev": true,
+					"optional": true
 				}
 			}
 		},
@@ -3209,6 +3236,14 @@
 				"tildify": "1.2.0",
 				"v8flags": "2.1.1",
 				"vinyl-fs": "0.3.14"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
+					"dev": true
+				}
 			}
 		},
 		"gulp-autoprefixer": {
@@ -3594,6 +3629,14 @@
 				"replace-ext": "0.0.1",
 				"through2": "2.0.3",
 				"vinyl": "0.5.3"
+			},
+			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
+					"dev": true
+				}
 			}
 		},
 		"gulp-wp-pot": {
@@ -4646,6 +4689,12 @@
 				"trim-newlines": "1.0.0"
 			},
 			"dependencies": {
+				"minimist": {
+					"version": "1.2.0",
+					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+					"integrity": "sha512-7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw==",
+					"dev": true
+				},
 				"object-assign": {
 					"version": "4.1.1",
 					"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -4706,9 +4755,9 @@
 			}
 		},
 		"minimist": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+			"integrity": "sha512-miQKw5Hv4NS1Psg2517mV4e4dYNaO3++hjAvLOAzKqZ61rH8NS1SK+vbfBWZ5PY/Me/bEWhUwqMghEW5Fb9T7Q==",
 			"dev": true
 		},
 		"mixin-deep": {
@@ -4735,18 +4784,10 @@
 		"mkdirp": {
 			"version": "0.5.1",
 			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+			"integrity": "sha512-SknJC52obPfGQPnjIkXbmA6+5H15E+fR+E4iR2oQ3zzCLbd7/ONua69R/Gw7AgkTLsRG+r5fzksYwWe1AgTyWA==",
 			"dev": true,
 			"requires": {
 				"minimist": "0.0.8"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-					"dev": true
-				}
 			}
 		},
 		"ms": {