diff --git a/package-lock.json b/package-lock.json
index 6b9e9b7a..04964a83 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -76,12 +76,6 @@
             "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
             "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY="
         },
-        "ajv-keywords": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz",
-            "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=",
-            "dev": true
-        },
         "alertify.js": {
             "version": "1.0.12",
             "resolved": "https://registry.npmjs.org/alertify.js/-/alertify.js-1.0.12.tgz",
@@ -345,10 +339,30 @@
             "dev": true
         },
         "babel-loader": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.0.0.tgz",
-            "integrity": "sha1-LkOma+4f/0RwUz0EAsikUy+vuvc=",
-            "dev": true
+            "version": "7.1.0",
+            "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.0.tgz",
+            "integrity": "sha1-P78lgfCFd0vZZC3KmZDm1sFJEUQ=",
+            "dev": true,
+            "dependencies": {
+                "find-cache-dir": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz",
+                    "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=",
+                    "dev": true
+                },
+                "find-up": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+                    "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+                    "dev": true
+                },
+                "pkg-dir": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+                    "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+                    "dev": true
+                }
+            }
         },
         "babel-messages": {
             "version": "6.23.0",
@@ -1040,6 +1054,12 @@
             "integrity": "sha1-NlKgkGq5sqfgw85mpAjpV6JIVSI=",
             "dev": true
         },
+        "d": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+            "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+            "dev": true
+        },
         "dashdash": {
             "version": "1.14.1",
             "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@@ -1190,11 +1210,47 @@
             "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz",
             "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw="
         },
+        "es5-ext": {
+            "version": "0.10.23",
+            "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.23.tgz",
+            "integrity": "sha1-dXi1G+l0IHpUh4IbVlOMIk5Oezg=",
+            "dev": true
+        },
+        "es6-iterator": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz",
+            "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
+            "dev": true
+        },
+        "es6-map": {
+            "version": "0.1.5",
+            "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz",
+            "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
+            "dev": true
+        },
         "es6-promise": {
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
             "integrity": "sha1-oIzd6EzNvzTQJ6FFG8kdS80ophM="
         },
+        "es6-set": {
+            "version": "0.1.5",
+            "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz",
+            "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
+            "dev": true
+        },
+        "es6-symbol": {
+            "version": "3.1.1",
+            "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+            "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+            "dev": true
+        },
+        "es6-weak-map": {
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz",
+            "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
+            "dev": true
+        },
         "escape-string-regexp": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1212,6 +1268,20 @@
                 }
             }
         },
+        "escope": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz",
+            "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=",
+            "dev": true,
+            "dependencies": {
+                "estraverse": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+                    "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+                    "dev": true
+                }
+            }
+        },
         "esprima": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
@@ -1222,6 +1292,20 @@
             "resolved": "https://registry.npmjs.org/espurify/-/espurify-1.7.0.tgz",
             "integrity": "sha1-HFz2y8zDLm9jk4C9T5kfq5up0iY="
         },
+        "esrecurse": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz",
+            "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=",
+            "dev": true,
+            "dependencies": {
+                "estraverse": {
+                    "version": "4.2.0",
+                    "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+                    "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+                    "dev": true
+                }
+            }
+        },
         "estraverse": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.5.1.tgz",
@@ -1232,6 +1316,12 @@
             "resolved": "https://registry.npmjs.org/esutils/-/esutils-1.0.0.tgz",
             "integrity": "sha1-gVHTWOIMisx/t0XnRywAJf5JZXA="
         },
+        "event-emitter": {
+            "version": "0.3.5",
+            "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+            "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+            "dev": true
+        },
         "events": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
@@ -1295,6 +1385,12 @@
                 }
             }
         },
+        "fast-deep-equal": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-0.1.0.tgz",
+            "integrity": "sha1-XG9FmaumszPuM0Li7ZeGcvEAH40=",
+            "dev": true
+        },
         "fast-levenshtein": {
             "version": "2.0.6",
             "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
@@ -1322,12 +1418,6 @@
             "resolved": "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz",
             "integrity": "sha1-w8T2xmO5I0WamqKZEtLQMfFQf4Q="
         },
-        "find-cache-dir": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz",
-            "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=",
-            "dev": true
-        },
         "find-up": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
@@ -2468,6 +2558,12 @@
             "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
             "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
         },
+        "json-schema-traverse": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.0.tgz",
+            "integrity": "sha1-ABbAscoe/kbUTTdUG838Gdz64Ns=",
+            "dev": true
+        },
         "json-stable-stringify": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
@@ -2532,9 +2628,9 @@
             "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4="
         },
         "lint-staged": {
-            "version": "3.6.1",
-            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-3.6.1.tgz",
-            "integrity": "sha1-JEI8i3vZnZbhWs0ayMs5KnjlhYI=",
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-4.0.0.tgz",
+            "integrity": "sha1-wVZp9ZhhSm5oCQMD4XWnmdSODYU=",
             "dev": true
         },
         "listr": {
@@ -2586,6 +2682,20 @@
             "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=",
             "dev": true
         },
+        "locate-path": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+            "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+            "dev": true,
+            "dependencies": {
+                "path-exists": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+                    "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+                    "dev": true
+                }
+            }
+        },
         "lodash": {
             "version": "4.17.4",
             "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
@@ -2660,10 +2770,16 @@
             "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.14.0.tgz",
             "integrity": "sha1-VyJK7xcByu7Sc7F6OalW5ysXJGI="
         },
+        "make-dir": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz",
+            "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=",
+            "dev": true
+        },
         "mapbox-gl": {
-            "version": "0.37.0",
-            "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.37.0.tgz",
-            "integrity": "sha1-IBA7Cuc6Dnf+lAVDl0kxi4fATxA="
+            "version": "0.38.0",
+            "resolved": "https://registry.npmjs.org/mapbox-gl/-/mapbox-gl-0.38.0.tgz",
+            "integrity": "sha1-ZHMbtV6r2qUgJwgVF1/PMeWjzYA="
         },
         "mapbox-gl-supported": {
             "version": "1.2.0",
@@ -2947,6 +3063,18 @@
             "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
             "dev": true
         },
+        "p-limit": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz",
+            "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=",
+            "dev": true
+        },
+        "p-locate": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+            "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+            "dev": true
+        },
         "p-map": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.1.1.tgz",
@@ -3049,12 +3177,6 @@
             "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
             "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o="
         },
-        "pkg-dir": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
-            "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=",
-            "dev": true
-        },
         "point-geometry": {
             "version": "0.0.0",
             "resolved": "https://registry.npmjs.org/point-geometry/-/point-geometry-0.0.0.tgz",
@@ -3521,12 +3643,6 @@
             "resolved": "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.2.0.tgz",
             "integrity": "sha1-MPwrEcBwZFke41eAyCa+kTEvIUQ="
         },
-        "source-list-map": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-1.1.2.tgz",
-            "integrity": "sha1-mIkBnRAkzOVc3AaUmDN+9hhqEaE=",
-            "dev": true
-        },
         "source-map": {
             "version": "0.1.43",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
@@ -3896,6 +4012,32 @@
             "dev": true,
             "optional": true
         },
+        "uglifyjs-webpack-plugin": {
+            "version": "0.4.6",
+            "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz",
+            "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=",
+            "dev": true,
+            "dependencies": {
+                "source-list-map": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+                    "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+                    "dev": true
+                },
+                "source-map": {
+                    "version": "0.5.6",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
+                    "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
+                    "dev": true
+                },
+                "webpack-sources": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+                    "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+                    "dev": true
+                }
+            }
+        },
         "unassert": {
             "version": "1.5.1",
             "resolved": "https://registry.npmjs.org/unassert/-/unassert-1.5.1.tgz",
@@ -4107,9 +4249,9 @@
             }
         },
         "webpack": {
-            "version": "2.6.1",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.6.1.tgz",
-            "integrity": "sha1-LgRX8KuxrF3zqxBsacZy8jZ4Xwc=",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.0.0.tgz",
+            "integrity": "sha1-7pvOvyEkf3FTy0EBaMq0XjpZ1Nc=",
             "dev": true,
             "dependencies": {
                 "acorn": {
@@ -4118,6 +4260,18 @@
                     "integrity": "sha1-xGDfCEkUY/AozLguqzcwvwEIez0=",
                     "dev": true
                 },
+                "ajv": {
+                    "version": "5.2.0",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.0.tgz",
+                    "integrity": "sha1-wXNQJMXaLvdcwZBxMHPUTwmL9IY=",
+                    "dev": true
+                },
+                "ajv-keywords": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-2.1.0.tgz",
+                    "integrity": "sha1-opbhf3v658HOT34N5T0pyzIWLfA=",
+                    "dev": true
+                },
                 "async": {
                     "version": "2.4.1",
                     "resolved": "https://registry.npmjs.org/async/-/async-2.4.1.tgz",
@@ -4136,10 +4290,10 @@
                     "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=",
                     "dev": true
                 },
-                "loader-utils": {
-                    "version": "0.2.17",
-                    "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz",
-                    "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=",
+                "source-list-map": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
+                    "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
                     "dev": true
                 },
                 "source-map": {
@@ -4154,6 +4308,12 @@
                     "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=",
                     "dev": true
                 },
+                "webpack-sources": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
+                    "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+                    "dev": true
+                },
                 "yargs": {
                     "version": "6.6.0",
                     "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz",
@@ -4168,20 +4328,6 @@
                 }
             }
         },
-        "webpack-sources": {
-            "version": "0.2.3",
-            "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.2.3.tgz",
-            "integrity": "sha1-F8Yr+vE8cH+dAsR54Nzd6DgGl/s=",
-            "dev": true,
-            "dependencies": {
-                "source-map": {
-                    "version": "0.5.6",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz",
-                    "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=",
-                    "dev": true
-                }
-            }
-        },
         "webStorage": {
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/webStorage/-/webStorage-1.2.3.tgz",
diff --git a/package.json b/package.json
index d35c0839..1cfbde8b 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "license": "CC0-1.0",
     "dependencies": {
         "alertify.js": "^1.0.12",
-        "mapbox-gl": "^0.37.0",
+        "mapbox-gl": "^0.38.0",
         "marked": "^0.3.6",
         "normalize.css": "^7.0.0",
         "webStorage": "^1.2.3"
@@ -14,15 +14,15 @@
     "devDependencies": {
         "babel-cli": "^6.18.0",
         "babel-core": "^6.21.0",
-        "babel-loader": "7.0.0",
+        "babel-loader": "^7.1.0",
         "babel-preset-env": "^1.2.2",
         "babel-preset-es2015": "^6.18.0",
         "babel-preset-latest": "^6.16.0",
         "babel-runtime": "^6.20.0",
-        "lint-staged": "^3.2.1",
+        "lint-staged": "^4.0.0",
         "pre-commit": "^1.1.3",
         "stylelint-config-standard": "^16.0.0",
-        "webpack": "^2.2.0"
+        "webpack": "^3.0.0"
     },
     "scripts": {
         "compress": "scripts/compress",