diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index a5950f0922..9732949876 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -267,20 +267,6 @@
     "bn.js": {
       "version": "4.6.1"
     },
-    "body-parser": {
-      "version": "1.8.4",
-      "dependencies": {
-        "ee-first": {
-          "version": "1.0.5"
-        },
-        "on-finished": {
-          "version": "2.1.0"
-        },
-        "qs": {
-          "version": "2.2.4"
-        }
-      }
-    },
     "boom": {
       "version": "2.10.1"
     },
@@ -1427,7 +1413,44 @@
       "version": "1.8.3"
     },
     "broccoli": {
-      "version": "0.15.4"
+      "version": "0.16.9",
+      "dependencies": {
+        "async": {
+          "version": "1.5.0"
+        },
+        "camelcase": {
+          "version": "1.2.1"
+        },
+        "cliui": {
+          "version": "2.1.0"
+        },
+        "handlebars": {
+          "version": "4.0.5"
+        },
+        "source-map": {
+          "version": "0.4.4"
+        },
+        "uglify-js": {
+          "version": "2.6.1",
+          "dependencies": {
+            "async": {
+              "version": "0.2.10"
+            },
+            "source-map": {
+              "version": "0.5.3"
+            }
+          }
+        },
+        "window-size": {
+          "version": "0.1.0"
+        },
+        "wordwrap": {
+          "version": "0.0.2"
+        },
+        "yargs": {
+          "version": "3.10.0"
+        }
+      }
     },
     "broccoli-filter": {
       "version": "0.1.14",
@@ -1554,9 +1577,6 @@
     "builtins": {
       "version": "0.0.7"
     },
-    "bytes": {
-      "version": "1.0.0"
-    },
     "callsite": {
       "version": "1.0.0"
     },
@@ -1905,9 +1925,6 @@
     "delegates": {
       "version": "0.1.0"
     },
-    "depd": {
-      "version": "0.4.5"
-    },
     "deprecated": {
       "version": "0.0.1"
     },
@@ -2184,9 +2201,6 @@
     "fast-ordered-set": {
       "version": "1.0.2"
     },
-    "faye-websocket": {
-      "version": "0.7.3"
-    },
     "fbjs": {
       "version": "0.6.0",
       "dependencies": {
@@ -3338,9 +3352,6 @@
     "https-proxy-agent": {
       "version": "1.0.0"
     },
-    "iconv-lite": {
-      "version": "0.4.4"
-    },
     "ieee754": {
       "version": "1.1.6"
     },
@@ -3753,9 +3764,6 @@
         }
       }
     },
-    "livereload-js": {
-      "version": "2.2.2"
-    },
     "load-json-file": {
       "version": "1.1.0",
       "dependencies": {
@@ -4692,9 +4700,6 @@
         }
       }
     },
-    "qs": {
-      "version": "2.2.5"
-    },
     "querystring": {
       "version": "0.2.0"
     },
@@ -4718,9 +4723,6 @@
     "range-parser": {
       "version": "1.0.3"
     },
-    "raw-body": {
-      "version": "1.3.0"
-    },
     "rc": {
       "version": "1.1.6",
       "dependencies": {
@@ -5402,17 +5404,6 @@
     "timers-ext": {
       "version": "0.1.0"
     },
-    "tiny-lr": {
-      "version": "0.1.7",
-      "dependencies": {
-        "debug": {
-          "version": "2.0.0"
-        },
-        "ms": {
-          "version": "0.6.2"
-        }
-      }
-    },
     "tmp": {
       "version": "0.0.25"
     },
@@ -5543,9 +5534,6 @@
     "type-detect": {
       "version": "0.1.2"
     },
-    "type-is": {
-      "version": "1.5.7"
-    },
     "typedarray": {
       "version": "0.0.6"
     },
@@ -5834,12 +5822,6 @@
         }
       }
     },
-    "websocket-driver": {
-      "version": "0.6.3"
-    },
-    "websocket-extensions": {
-      "version": "0.1.1"
-    },
     "whatwg-fetch": {
       "version": "0.9.0"
     },
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 60c4bfc9a5..ef235e594a 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -439,28 +439,6 @@
       "from": "bn.js@>=4.1.1 <5.0.0",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.6.1.tgz"
     },
-    "body-parser": {
-      "version": "1.8.4",
-      "from": "body-parser@>=1.8.0 <1.9.0",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.8.4.tgz",
-      "dependencies": {
-        "ee-first": {
-          "version": "1.0.5",
-          "from": "ee-first@1.0.5",
-          "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.0.5.tgz"
-        },
-        "on-finished": {
-          "version": "2.1.0",
-          "from": "on-finished@2.1.0",
-          "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.1.0.tgz"
-        },
-        "qs": {
-          "version": "2.2.4",
-          "from": "qs@2.2.4",
-          "resolved": "https://registry.npmjs.org/qs/-/qs-2.2.4.tgz"
-        }
-      }
-    },
     "boom": {
       "version": "2.10.1",
       "from": "boom@>=2.0.0 <3.0.0",
@@ -2225,9 +2203,68 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.3.tgz"
     },
     "broccoli": {
-      "version": "0.15.4",
-      "from": "broccoli@>=0.15.3 <0.16.0",
-      "resolved": "https://registry.npmjs.org/broccoli/-/broccoli-0.15.4.tgz"
+      "version": "0.16.9",
+      "from": "broccoli@0.16.9",
+      "resolved": "https://registry.npmjs.org/broccoli/-/broccoli-0.16.9.tgz",
+      "dependencies": {
+        "async": {
+          "version": "1.5.0",
+          "from": "async@>=1.4.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz"
+        },
+        "camelcase": {
+          "version": "1.2.1",
+          "from": "camelcase@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
+        },
+        "cliui": {
+          "version": "2.1.0",
+          "from": "cliui@>=2.1.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"
+        },
+        "handlebars": {
+          "version": "4.0.5",
+          "from": "handlebars@>=4.0.4 <5.0.0",
+          "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz"
+        },
+        "source-map": {
+          "version": "0.4.4",
+          "from": "source-map@>=0.4.4 <0.5.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
+        },
+        "uglify-js": {
+          "version": "2.6.1",
+          "from": "uglify-js@>=2.6.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.6.1.tgz",
+          "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"
+            },
+            "source-map": {
+              "version": "0.5.3",
+              "from": "source-map@>=0.5.1 <0.6.0",
+              "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+            }
+          }
+        },
+        "window-size": {
+          "version": "0.1.0",
+          "from": "window-size@0.1.0",
+          "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"
+        },
+        "wordwrap": {
+          "version": "0.0.2",
+          "from": "wordwrap@0.0.2",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
+        },
+        "yargs": {
+          "version": "3.10.0",
+          "from": "yargs@>=3.10.0 <3.11.0",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"
+        }
+      }
     },
     "broccoli-filter": {
       "version": "0.1.14",
@@ -2428,11 +2465,6 @@
       "from": "builtins@>=0.0.3 <0.1.0",
       "resolved": "https://registry.npmjs.org/builtins/-/builtins-0.0.7.tgz"
     },
-    "bytes": {
-      "version": "1.0.0",
-      "from": "bytes@1.0.0",
-      "resolved": "https://registry.npmjs.org/bytes/-/bytes-1.0.0.tgz"
-    },
     "callsite": {
       "version": "1.0.0",
       "from": "callsite@1.0.0",
@@ -2993,11 +3025,6 @@
       "from": "delegates@>=0.1.0 <0.2.0",
       "resolved": "https://registry.npmjs.org/delegates/-/delegates-0.1.0.tgz"
     },
-    "depd": {
-      "version": "0.4.5",
-      "from": "depd@0.4.5",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-0.4.5.tgz"
-    },
     "deprecated": {
       "version": "0.0.1",
       "from": "deprecated@>=0.0.1 <0.0.2",
@@ -3442,11 +3469,6 @@
       "from": "fast-ordered-set@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/fast-ordered-set/-/fast-ordered-set-1.0.2.tgz"
     },
-    "faye-websocket": {
-      "version": "0.7.3",
-      "from": "faye-websocket@>=0.7.2 <0.8.0",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.7.3.tgz"
-    },
     "fbjs": {
       "version": "0.6.0",
       "from": "fbjs@>=0.6.0 <0.7.0",
@@ -5296,11 +5318,6 @@
       "from": "https-proxy-agent@>=1.0.0 <2.0.0",
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz"
     },
-    "iconv-lite": {
-      "version": "0.4.4",
-      "from": "iconv-lite@0.4.4",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.4.tgz"
-    },
     "ieee754": {
       "version": "1.1.6",
       "from": "ieee754@>=1.1.4 <2.0.0",
@@ -5973,11 +5990,6 @@
         }
       }
     },
-    "livereload-js": {
-      "version": "2.2.2",
-      "from": "livereload-js@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/livereload-js/-/livereload-js-2.2.2.tgz"
-    },
     "load-json-file": {
       "version": "1.1.0",
       "from": "load-json-file@>=1.0.0 <2.0.0",
@@ -7486,11 +7498,6 @@
         }
       }
     },
-    "qs": {
-      "version": "2.2.5",
-      "from": "qs@>=2.2.3 <2.3.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-2.2.5.tgz"
-    },
     "querystring": {
       "version": "0.2.0",
       "from": "querystring@0.2.0",
@@ -7528,11 +7535,6 @@
       "from": "range-parser@>=1.0.0 <1.1.0",
       "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"
     },
-    "raw-body": {
-      "version": "1.3.0",
-      "from": "raw-body@1.3.0",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-1.3.0.tgz"
-    },
     "rc": {
       "version": "1.1.6",
       "from": "rc@>=1.0.1 <2.0.0",
@@ -8620,23 +8622,6 @@
       "from": "timers-ext@>=0.1.0 <0.2.0",
       "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.0.tgz"
     },
-    "tiny-lr": {
-      "version": "0.1.7",
-      "from": "tiny-lr@>=0.1.4 <0.2.0",
-      "resolved": "https://registry.npmjs.org/tiny-lr/-/tiny-lr-0.1.7.tgz",
-      "dependencies": {
-        "debug": {
-          "version": "2.0.0",
-          "from": "debug@>=2.0.0 <2.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz"
-        },
-        "ms": {
-          "version": "0.6.2",
-          "from": "ms@0.6.2",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz"
-        }
-      }
-    },
     "tmp": {
       "version": "0.0.25",
       "from": "tmp@0.0.25",
@@ -8847,11 +8832,6 @@
       "from": "type-detect@>=0.1.2 <0.2.0",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.2.tgz"
     },
-    "type-is": {
-      "version": "1.5.7",
-      "from": "type-is@>=1.5.1 <1.6.0",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.5.7.tgz"
-    },
     "typedarray": {
       "version": "0.0.6",
       "from": "typedarray@>=0.0.5 <0.1.0",
@@ -9316,16 +9296,6 @@
         }
       }
     },
-    "websocket-driver": {
-      "version": "0.6.3",
-      "from": "websocket-driver@>=0.3.6",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.3.tgz"
-    },
-    "websocket-extensions": {
-      "version": "0.1.1",
-      "from": "websocket-extensions@>=0.1.1",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"
-    },
     "whatwg-fetch": {
       "version": "0.9.0",
       "from": "whatwg-fetch@>=0.9.0 <0.10.0",
diff --git a/package.json b/package.json
index f1a51c815e..5b1e89ba5a 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,7 @@
     "angular-mocks": "^1.4.7",
     "base64-js": "^0.0.8",
     "bower": "^1.3.12",
-    "broccoli": "^0.15.3",
+    "broccoli": "^0.16.9",
     "broccoli-funnel": "^1.0.1",
     "broccoli-slow-trees": "^1.1.0",
     "broccoli-stew": "^0.2.1",