diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index a0836b5..b4825b2 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -701,18 +701,6 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.16.0.tgz",
       "dev": true
     },
-    "babel-plugin-transform-cjs-system-require": {
-      "version": "0.1.1",
-      "from": "babel-plugin-transform-cjs-system-require@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-cjs-system-require/-/babel-plugin-transform-cjs-system-require-0.1.1.tgz",
-      "dev": true
-    },
-    "babel-plugin-transform-cjs-system-wrapper": {
-      "version": "0.2.1",
-      "from": "babel-plugin-transform-cjs-system-wrapper@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-cjs-system-wrapper/-/babel-plugin-transform-cjs-system-wrapper-0.2.1.tgz",
-      "dev": true
-    },
     "babel-plugin-transform-class-constructor-call": {
       "version": "6.18.0",
       "from": "babel-plugin-transform-class-constructor-call@>=6.3.13 <7.0.0",
@@ -905,12 +893,6 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.8.0.tgz",
       "dev": true
     },
-    "babel-plugin-transform-global-system-wrapper": {
-      "version": "0.0.1",
-      "from": "babel-plugin-transform-global-system-wrapper@0.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-global-system-wrapper/-/babel-plugin-transform-global-system-wrapper-0.0.1.tgz",
-      "dev": true
-    },
     "babel-plugin-transform-jscript": {
       "version": "6.8.0",
       "from": "babel-plugin-transform-jscript@>=6.8.0 <7.0.0",
@@ -965,12 +947,6 @@
       "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.18.0.tgz",
       "dev": true
     },
-    "babel-plugin-transform-system-register": {
-      "version": "0.0.1",
-      "from": "babel-plugin-transform-system-register@0.0.1",
-      "resolved": "https://registry.npmjs.org/babel-plugin-transform-system-register/-/babel-plugin-transform-system-register-0.0.1.tgz",
-      "dev": true
-    },
     "babel-polyfill": {
       "version": "6.16.0",
       "from": "babel-polyfill@>=6.3.14 <7.0.0",
@@ -1246,26 +1222,12 @@
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.4.0.tgz",
       "dev": true
     },
-    "bser": {
-      "version": "1.0.2",
-      "from": "bser@>=1.0.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/bser/-/bser-1.0.2.tgz",
-      "dev": true,
-      "optional": true
-    },
     "buffer": {
       "version": "4.9.1",
       "from": "buffer@>=4.9.0 <5.0.0",
       "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz",
       "dev": true
     },
-    "buffer-peek-stream": {
-      "version": "1.0.1",
-      "from": "buffer-peek-stream@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/buffer-peek-stream/-/buffer-peek-stream-1.0.1.tgz",
-      "dev": true,
-      "optional": true
-    },
     "buffer-shims": {
       "version": "1.0.0",
       "from": "buffer-shims@>=1.0.0 <2.0.0",
@@ -1335,9 +1297,9 @@
       }
     },
     "caniuse-db": {
-      "version": "1.0.30000589",
+      "version": "1.0.30000591",
       "from": "caniuse-db@>=1.0.30000578 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000589.tgz",
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000591.tgz",
       "dev": true
     },
     "caseless": {
@@ -1389,9 +1351,9 @@
       "dev": true
     },
     "clap": {
-      "version": "1.1.1",
+      "version": "1.1.2",
       "from": "clap@>=1.0.9 <2.0.0",
-      "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/clap/-/clap-1.1.2.tgz",
       "dev": true
     },
     "classnames": {
@@ -1805,9 +1767,9 @@
       "dev": true
     },
     "css-loader": {
-      "version": "0.26.0",
-      "from": "css-loader@0.26.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.0.tgz",
+      "version": "0.26.1",
+      "from": "css-loader@latest",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.1.tgz",
       "dev": true
     },
     "css-select": {
@@ -1910,12 +1872,6 @@
         }
       }
     },
-    "data-uri-to-buffer": {
-      "version": "0.0.4",
-      "from": "data-uri-to-buffer@0.0.4",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-0.0.4.tgz",
-      "dev": true
-    },
     "date-now": {
       "version": "0.1.4",
       "from": "date-now@>=0.1.4 <0.2.0",
@@ -1986,13 +1942,6 @@
       "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
       "dev": true
     },
-    "detect-file": {
-      "version": "0.1.0",
-      "from": "detect-file@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-0.1.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "detect-indent": {
       "version": "4.0.0",
       "from": "detect-indent@>=4.0.0 <5.0.0",
@@ -2151,20 +2100,6 @@
       "from": "encoding@>=0.1.11 <0.2.0",
       "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"
     },
-    "end-of-stream": {
-      "version": "1.1.0",
-      "from": "end-of-stream@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.1.0.tgz",
-      "dev": true,
-      "dependencies": {
-        "once": {
-          "version": "1.3.3",
-          "from": "once@>=1.3.0 <1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
-          "dev": true
-        }
-      }
-    },
     "engine.io": {
       "version": "1.6.10",
       "from": "engine.io@1.6.10",
@@ -2257,13 +2192,6 @@
       "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-2.6.0.tgz",
       "dev": true
     },
-    "err-code": {
-      "version": "1.1.1",
-      "from": "err-code@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.1.tgz",
-      "dev": true,
-      "optional": true
-    },
     "errno": {
       "version": "0.1.4",
       "from": "errno@>=0.1.3 <0.2.0",
@@ -2322,12 +2250,6 @@
       "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.0.tgz",
       "dev": true
     },
-    "es6-template-strings": {
-      "version": "2.0.1",
-      "from": "es6-template-strings@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/es6-template-strings/-/es6-template-strings-2.0.1.tgz",
-      "dev": true
-    },
     "es6-templates": {
       "version": "0.2.3",
       "from": "es6-templates@>=0.2.2 <0.3.0",
@@ -2391,20 +2313,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.7.1.tgz",
       "dev": true
     },
-    "esniff": {
-      "version": "1.1.0",
-      "from": "esniff@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/esniff/-/esniff-1.1.0.tgz",
-      "dev": true,
-      "dependencies": {
-        "d": {
-          "version": "1.0.0",
-          "from": "d@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
-          "dev": true
-        }
-      }
-    },
     "espree": {
       "version": "3.3.2",
       "from": "espree@>=3.3.1 <4.0.0",
@@ -2473,13 +2381,6 @@
       "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz",
       "dev": true
     },
-    "exec-sh": {
-      "version": "0.2.0",
-      "from": "exec-sh@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.2.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "exit-hook": {
       "version": "1.1.1",
       "from": "exit-hook@>=1.0.0 <2.0.0",
@@ -2530,12 +2431,6 @@
       "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
       "dev": true
     },
-    "expand-tilde": {
-      "version": "1.2.2",
-      "from": "expand-tilde@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-1.2.2.tgz",
-      "dev": true
-    },
     "exports-loader": {
       "version": "0.6.3",
       "from": "exports-loader@>=0.6.3 <0.7.0",
@@ -2630,13 +2525,6 @@
       "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
       "dev": true
     },
-    "fb-watchman": {
-      "version": "1.9.0",
-      "from": "fb-watchman@>=1.8.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-1.9.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "fbjs": {
       "version": "0.8.6",
       "from": "fbjs@>=0.8.4 <0.9.0",
@@ -2711,27 +2599,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
       "dev": true
     },
-    "findup-sync": {
-      "version": "0.4.3",
-      "from": "findup-sync@>=0.4.2 <0.5.0",
-      "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.4.3.tgz",
-      "dev": true,
-      "optional": true
-    },
-    "fined": {
-      "version": "1.0.2",
-      "from": "fined@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/fined/-/fined-1.0.2.tgz",
-      "dev": true,
-      "optional": true
-    },
-    "flagged-respawn": {
-      "version": "0.3.2",
-      "from": "flagged-respawn@>=0.3.2 <0.4.0",
-      "resolved": "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-0.3.2.tgz",
-      "dev": true,
-      "optional": true
-    },
     "flat-cache": {
       "version": "1.2.1",
       "from": "flat-cache@>=1.2.1 <2.0.0",
@@ -2813,13 +2680,6 @@
       "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz",
       "dev": true
     },
-    "fs-exists-sync": {
-      "version": "0.1.0",
-      "from": "fs-exists-sync@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "fs-readdir-recursive": {
       "version": "0.1.2",
       "from": "fs-readdir-recursive@>=0.1.0 <0.2.0",
@@ -2923,20 +2783,6 @@
       "resolved": "https://registry.npmjs.org/global/-/global-4.3.1.tgz",
       "dev": true
     },
-    "global-modules": {
-      "version": "0.2.3",
-      "from": "global-modules@>=0.2.3 <0.3.0",
-      "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-0.2.3.tgz",
-      "dev": true,
-      "optional": true
-    },
-    "global-prefix": {
-      "version": "0.1.4",
-      "from": "global-prefix@>=0.1.4 <0.2.0",
-      "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-0.1.4.tgz",
-      "dev": true,
-      "optional": true
-    },
     "globals": {
       "version": "9.13.0",
       "from": "globals@>=9.0.0 <10.0.0",
@@ -3292,13 +3138,6 @@
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
       "dev": true
     },
-    "ini": {
-      "version": "1.3.4",
-      "from": "ini@>=1.3.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz",
-      "dev": true,
-      "optional": true
-    },
     "inquirer": {
       "version": "0.12.0",
       "from": "inquirer@>=0.12.0 <0.13.0",
@@ -3353,13 +3192,6 @@
       "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.1.1.tgz",
       "dev": true
     },
-    "is-absolute": {
-      "version": "0.2.6",
-      "from": "is-absolute@>=0.2.3 <0.3.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.2.6.tgz",
-      "dev": true,
-      "optional": true
-    },
     "is-absolute-url": {
       "version": "2.0.0",
       "from": "is-absolute-url@>=2.0.0 <3.0.0",
@@ -3513,13 +3345,6 @@
       "from": "is-regex@>=1.0.3 <2.0.0",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.3.tgz"
     },
-    "is-relative": {
-      "version": "0.2.1",
-      "from": "is-relative@>=0.2.1 <0.3.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.2.1.tgz",
-      "dev": true,
-      "optional": true
-    },
     "is-resolvable": {
       "version": "1.0.0",
       "from": "is-resolvable@>=1.0.0 <2.0.0",
@@ -3554,13 +3379,6 @@
       "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
       "dev": true
     },
-    "is-unc-path": {
-      "version": "0.1.1",
-      "from": "is-unc-path@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-0.1.1.tgz",
-      "dev": true,
-      "optional": true
-    },
     "is-upper-case": {
       "version": "1.1.2",
       "from": "is-upper-case@>=1.1.0 <2.0.0",
@@ -3573,12 +3391,6 @@
       "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz",
       "dev": true
     },
-    "is-windows": {
-      "version": "0.2.0",
-      "from": "is-windows@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-0.2.0.tgz",
-      "dev": true
-    },
     "isarray": {
       "version": "1.0.0",
       "from": "isarray@>=1.0.0 <1.1.0",
@@ -3719,89 +3531,6 @@
       "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.0.tgz",
       "dev": true
     },
-    "jspm": {
-      "version": "0.17.0-beta.32",
-      "from": "jspm@>=0.17.0-beta.13 <0.18.0",
-      "resolved": "https://registry.npmjs.org/jspm/-/jspm-0.17.0-beta.32.tgz",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "from": "async@>=0.2.6 <0.3.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-          "dev": true,
-          "optional": true
-        },
-        "core-js": {
-          "version": "1.2.7",
-          "from": "core-js@>=1.2.6 <2.0.0",
-          "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
-          "dev": true,
-          "optional": true
-        },
-        "glob": {
-          "version": "6.0.4",
-          "from": "glob@>=6.0.1 <7.0.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-          "dev": true,
-          "optional": true
-        },
-        "semver": {
-          "version": "5.3.0",
-          "from": "semver@>=5.1.0 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "dev": true,
-          "optional": true
-        },
-        "uglify-js": {
-          "version": "2.7.4",
-          "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "jspm-github": {
-      "version": "0.14.11",
-      "from": "jspm-github@>=0.14.11 <0.15.0",
-      "resolved": "https://registry.npmjs.org/jspm-github/-/jspm-github-0.14.11.tgz",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "from": "semver@>=5.0.1 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "jspm-npm": {
-      "version": "0.30.1",
-      "from": "jspm-npm@>=0.30.0 <0.31.0",
-      "resolved": "https://registry.npmjs.org/jspm-npm/-/jspm-npm-0.30.1.tgz",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "semver": {
-          "version": "5.3.0",
-          "from": "semver@>=5.0.1 <6.0.0",
-          "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
-    "jspm-registry": {
-      "version": "0.4.3",
-      "from": "jspm-registry@>=0.4.1 <0.5.0",
-      "resolved": "https://registry.npmjs.org/jspm-registry/-/jspm-registry-0.4.3.tgz",
-      "dev": true,
-      "optional": true
-    },
     "jsprim": {
       "version": "1.3.1",
       "from": "jsprim@>=1.2.2 <2.0.0",
@@ -3940,13 +3669,6 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
       "dev": true
     },
-    "liftoff": {
-      "version": "2.3.0",
-      "from": "liftoff@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-2.3.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "line-numbers": {
       "version": "0.2.0",
       "from": "line-numbers@0.2.0",
@@ -4024,13 +3746,6 @@
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
       "dev": true
     },
-    "lodash.assignwith": {
-      "version": "4.2.0",
-      "from": "lodash.assignwith@>=4.0.7 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.assignwith/-/lodash.assignwith-4.2.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "lodash.bind": {
       "version": "4.2.1",
       "from": "lodash.bind@>=4.1.4 <5.0.0",
@@ -4113,25 +3828,6 @@
       "from": "lodash.isarray@>=3.0.0 <4.0.0",
       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
     },
-    "lodash.isempty": {
-      "version": "4.4.0",
-      "from": "lodash.isempty@>=4.2.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isempty/-/lodash.isempty-4.4.0.tgz",
-      "dev": true,
-      "optional": true
-    },
-    "lodash.isplainobject": {
-      "version": "4.0.6",
-      "from": "lodash.isplainobject@>=4.0.4 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz",
-      "dev": true
-    },
-    "lodash.isstring": {
-      "version": "4.0.1",
-      "from": "lodash.isstring@>=4.0.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isstring/-/lodash.isstring-4.0.1.tgz",
-      "dev": true
-    },
     "lodash.keys": {
       "version": "3.1.2",
       "from": "lodash.keys@>=3.1.2 <4.0.0",
@@ -4143,13 +3839,6 @@
       "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
       "dev": true
     },
-    "lodash.mapvalues": {
-      "version": "4.6.0",
-      "from": "lodash.mapvalues@>=4.4.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.mapvalues/-/lodash.mapvalues-4.6.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "lodash.merge": {
       "version": "4.6.0",
       "from": "lodash.merge@>=4.4.0 <5.0.0",
@@ -4279,20 +3968,6 @@
         }
       }
     },
-    "makeerror": {
-      "version": "1.0.11",
-      "from": "makeerror@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz",
-      "dev": true,
-      "optional": true
-    },
-    "map-cache": {
-      "version": "0.2.2",
-      "from": "map-cache@>=0.2.0 <0.3.0",
-      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
-      "dev": true,
-      "optional": true
-    },
     "map-obj": {
       "version": "1.0.1",
       "from": "map-obj@>=1.0.1 <2.0.0",
@@ -4357,13 +4032,6 @@
         }
       }
     },
-    "merge": {
-      "version": "1.2.0",
-      "from": "merge@>=1.1.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "merge-descriptors": {
       "version": "1.0.1",
       "from": "merge-descriptors@1.0.1",
@@ -4510,13 +4178,6 @@
       "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz",
       "dev": true
     },
-    "ncp": {
-      "version": "2.0.0",
-      "from": "ncp@>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "neatequal": {
       "version": "1.0.0",
       "from": "neatequal@>=1.0.0 <2.0.0",
@@ -4529,13 +4190,6 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz",
       "dev": true
     },
-    "netrc": {
-      "version": "0.1.4",
-      "from": "netrc@>=0.1.3 <0.2.0",
-      "resolved": "https://registry.npmjs.org/netrc/-/netrc-0.1.4.tgz",
-      "dev": true,
-      "optional": true
-    },
     "next-tick": {
       "version": "0.2.2",
       "from": "next-tick@>=0.2.2 <0.3.0",
@@ -4573,13 +4227,6 @@
         }
       }
     },
-    "node-int64": {
-      "version": "0.4.0",
-      "from": "node-int64@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "node-libs-browser": {
       "version": "0.6.0",
       "from": "node-libs-browser@>=0.6.0 <0.7.0",
@@ -4864,13 +4511,6 @@
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.0.tgz",
       "dev": true
     },
-    "parse-filepath": {
-      "version": "1.0.1",
-      "from": "parse-filepath@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.1.tgz",
-      "dev": true,
-      "optional": true
-    },
     "parse-glob": {
       "version": "3.0.4",
       "from": "parse-glob@>=3.0.4 <4.0.0",
@@ -4961,20 +4601,6 @@
       "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
       "dev": true
     },
-    "path-root": {
-      "version": "0.1.1",
-      "from": "path-root@>=0.1.1 <0.2.0",
-      "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz",
-      "dev": true,
-      "optional": true
-    },
-    "path-root-regex": {
-      "version": "0.1.2",
-      "from": "path-root-regex@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz",
-      "dev": true,
-      "optional": true
-    },
     "path-to-regexp": {
       "version": "0.1.7",
       "from": "path-to-regexp@0.1.7",
@@ -5022,13 +4648,6 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz",
       "dev": true
     },
-    "pkg-resolve": {
-      "version": "0.1.14",
-      "from": "pkg-resolve@>=0.1.7 <0.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-resolve/-/pkg-resolve-0.1.14.tgz",
-      "dev": true,
-      "optional": true
-    },
     "pkginfo": {
       "version": "0.4.0",
       "from": "pkginfo@>=0.0.0 <1.0.0",
@@ -5110,9 +4729,9 @@
       "dev": true
     },
     "postcss-import": {
-      "version": "8.2.0",
-      "from": "postcss-import@>=8.1.2 <9.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-8.2.0.tgz",
+      "version": "9.0.0",
+      "from": "postcss-import@latest",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-9.0.0.tgz",
       "dev": true
     },
     "postcss-load-config": {
@@ -5134,10 +4753,24 @@
       "dev": true
     },
     "postcss-loader": {
-      "version": "1.1.1",
-      "from": "postcss-loader@1.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.1.1.tgz",
-      "dev": true
+      "version": "1.2.0",
+      "from": "postcss-loader@latest",
+      "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.2.0.tgz",
+      "dev": true,
+      "dependencies": {
+        "postcss": {
+          "version": "5.2.6",
+          "from": "postcss@>=5.2.6 <6.0.0",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.6.tgz",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "3.1.2",
+          "from": "supports-color@>=3.1.2 <4.0.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz",
+          "dev": true
+        }
+      }
     },
     "postcss-merge-idents": {
       "version": "2.1.7",
@@ -5387,13 +5020,6 @@
       "resolved": "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz",
       "dev": true
     },
-    "proper-lockfile": {
-      "version": "1.2.0",
-      "from": "proper-lockfile@>=1.1.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-1.2.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "proxy-addr": {
       "version": "1.1.2",
       "from": "proxy-addr@>=1.1.2 <1.2.0",
@@ -5412,12 +5038,6 @@
       "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
       "dev": true
     },
-    "pump": {
-      "version": "1.0.1",
-      "from": "pump@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.1.tgz",
-      "dev": true
-    },
     "punycode": {
       "version": "1.4.1",
       "from": "punycode@>=1.4.1 <2.0.0",
@@ -5981,13 +5601,6 @@
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
       "dev": true
     },
-    "resolve-dir": {
-      "version": "0.1.1",
-      "from": "resolve-dir@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-0.1.1.tgz",
-      "dev": true,
-      "optional": true
-    },
     "resolve-from": {
       "version": "1.0.1",
       "from": "resolve-from@>=1.0.0 <2.0.0",
@@ -6000,13 +5613,6 @@
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
       "dev": true
     },
-    "retry": {
-      "version": "0.10.0",
-      "from": "retry@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "revalidator": {
       "version": "0.1.8",
       "from": "revalidator@>=0.1.0 <0.2.0",
@@ -6031,18 +5637,6 @@
       "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-0.2.0.tgz",
       "dev": true
     },
-    "rollup": {
-      "version": "0.36.3",
-      "from": "rollup@>=0.36.3 <0.37.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-0.36.3.tgz",
-      "dev": true
-    },
-    "rsvp": {
-      "version": "3.3.3",
-      "from": "rsvp@>=3.0.13 <4.0.0",
-      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.3.3.tgz",
-      "dev": true
-    },
     "run-async": {
       "version": "0.1.0",
       "from": "run-async@>=0.1.0 <0.2.0",
@@ -6061,22 +5655,6 @@
       "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz",
       "dev": true
     },
-    "sane": {
-      "version": "1.4.1",
-      "from": "sane@>=1.3.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/sane/-/sane-1.4.1.tgz",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "minimist": {
-          "version": "1.2.0",
-          "from": "minimist@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-          "dev": true,
-          "optional": true
-        }
-      }
-    },
     "sass-graph": {
       "version": "2.1.2",
       "from": "sass-graph@>=2.1.1 <3.0.0",
@@ -6658,32 +6236,6 @@
       "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.1.4.tgz",
       "dev": true
     },
-    "systemjs": {
-      "version": "0.19.41",
-      "from": "systemjs@0.19.41",
-      "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-0.19.41.tgz",
-      "dev": true
-    },
-    "systemjs-builder": {
-      "version": "0.15.34",
-      "from": "systemjs-builder@0.15.34",
-      "resolved": "https://registry.npmjs.org/systemjs-builder/-/systemjs-builder-0.15.34.tgz",
-      "dev": true,
-      "dependencies": {
-        "async": {
-          "version": "0.2.10",
-          "from": "async@>=0.2.6 <0.3.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
-          "dev": true
-        },
-        "uglify-js": {
-          "version": "2.7.4",
-          "from": "uglify-js@>=2.6.1 <3.0.0",
-          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.7.4.tgz",
-          "dev": true
-        }
-      }
-    },
     "table": {
       "version": "3.8.3",
       "from": "table@>=3.7.8 <4.0.0",
@@ -6716,18 +6268,6 @@
       "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz",
       "dev": true
     },
-    "tar-fs": {
-      "version": "1.14.0",
-      "from": "tar-fs@>=1.13.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.14.0.tgz",
-      "dev": true
-    },
-    "tar-stream": {
-      "version": "1.5.2",
-      "from": "tar-stream@>=1.1.2 <2.0.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz",
-      "dev": true
-    },
     "text-table": {
       "version": "0.2.0",
       "from": "text-table@>=0.2.0 <0.3.0",
@@ -6772,13 +6312,6 @@
       "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.28.tgz",
       "dev": true
     },
-    "tmpl": {
-      "version": "1.0.4",
-      "from": "tmpl@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz",
-      "dev": true,
-      "optional": true
-    },
     "to-array": {
       "version": "0.1.4",
       "from": "to-array@0.1.4",
@@ -6809,32 +6342,6 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "dev": true
     },
-    "traceur": {
-      "version": "0.0.105",
-      "from": "traceur@0.0.105",
-      "resolved": "https://registry.npmjs.org/traceur/-/traceur-0.0.105.tgz",
-      "dev": true,
-      "dependencies": {
-        "glob": {
-          "version": "5.0.15",
-          "from": "glob@>=5.0.0 <5.1.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
-          "dev": true
-        },
-        "source-map": {
-          "version": "0.1.32",
-          "from": "source-map@0.1.32",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.32.tgz",
-          "dev": true
-        },
-        "source-map-support": {
-          "version": "0.2.10",
-          "from": "source-map-support@>=0.2.8 <0.3.0",
-          "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.2.10.tgz",
-          "dev": true
-        }
-      }
-    },
     "trim-newlines": {
       "version": "1.0.0",
       "from": "trim-newlines@>=1.0.0 <2.0.0",
@@ -6942,13 +6449,6 @@
       "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz",
       "dev": true
     },
-    "unc-path-regex": {
-      "version": "0.1.2",
-      "from": "unc-path-regex@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz",
-      "dev": true,
-      "optional": true
-    },
     "underscore": {
       "version": "1.8.3",
       "from": "underscore@>=1.7.0 <2.0.0",
@@ -7000,9 +6500,9 @@
       "dev": true
     },
     "unexpected-sinon": {
-      "version": "10.5.0",
-      "from": "unexpected-sinon@>=10.2.1 <11.0.0",
-      "resolved": "https://registry.npmjs.org/unexpected-sinon/-/unexpected-sinon-10.5.0.tgz",
+      "version": "10.5.1",
+      "from": "unexpected-sinon@latest",
+      "resolved": "https://registry.npmjs.org/unexpected-sinon/-/unexpected-sinon-10.5.1.tgz",
       "dev": true
     },
     "uniq": {
@@ -7219,25 +6719,11 @@
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
       "dev": true
     },
-    "walker": {
-      "version": "1.0.7",
-      "from": "walker@>=1.0.5 <1.1.0",
-      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz",
-      "dev": true,
-      "optional": true
-    },
     "warning": {
       "version": "2.1.0",
       "from": "warning@>=2.0.0 <3.0.0",
       "resolved": "https://registry.npmjs.org/warning/-/warning-2.1.0.tgz"
     },
-    "watch": {
-      "version": "0.10.0",
-      "from": "watch@>=0.10.0 <0.11.0",
-      "resolved": "https://registry.npmjs.org/watch/-/watch-0.10.0.tgz",
-      "dev": true,
-      "optional": true
-    },
     "watchpack": {
       "version": "0.2.9",
       "from": "watchpack@>=0.2.1 <0.3.0",
@@ -7408,12 +6894,6 @@
       "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-3.1.0.tgz",
       "dev": true
     },
-    "when": {
-      "version": "3.7.7",
-      "from": "when@>=3.7.5 <4.0.0",
-      "resolved": "https://registry.npmjs.org/when/-/when-3.7.7.tgz",
-      "dev": true
-    },
     "whet.extend": {
       "version": "0.9.9",
       "from": "whet.extend@>=0.9.9 <0.10.0",
diff --git a/package.json b/package.json
index 483eedd..ba590e1 100644
--- a/package.json
+++ b/package.json
@@ -53,7 +53,7 @@
     "babel-runtime": "^6.0.0",
     "bundle-loader": "^0.5.4",
     "circular-dependency-plugin": "^2.0.0",
-    "css-loader": "^0.26.0",
+    "css-loader": "^0.26.1",
     "enzyme": "^2.2.0",
     "eslint": "^3.1.1",
     "eslint-plugin-react": "^6.0.0",
@@ -76,8 +76,8 @@
     "loader-utils": "^0.2.15",
     "mocha": "^3.0.2",
     "node-sass": "^3.4.2",
-    "postcss-import": "^8.1.2",
-    "postcss-loader": "^1.0.0",
+    "postcss-import": "^9.0.0",
+    "postcss-loader": "^1.2.0",
     "postcss-scss": "^0.4.0",
     "postcss-url": "SleepWalker/postcss-url#switch-to-async-api",
     "raw-loader": "^0.5.1",
@@ -91,7 +91,7 @@
     "sinon": "^1.15.3",
     "style-loader": "^0.13.0",
     "unexpected": "^10.15.0",
-    "unexpected-sinon": "^10.2.1",
+    "unexpected-sinon": "^10.5.1",
     "url-loader": "^0.5.7",
     "webpack": "^1.12.9",
     "webpack-dev-server": "^1.14.0",
diff --git a/webpack.config.js b/webpack.config.js
index 91d250f..ca697d1 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -184,7 +184,6 @@ const webpackConfig = {
         return [
             cssImport({
                 path: rootPath,
-                addDependencyTo: webpack,
 
                 resolve: ((defaultResolve) =>
                     (url, basedir, importOptions) =>