diff --git a/package.json b/package.json
index 220899953..dc42f60bf 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "rimraf": "^2.4.4",
     "sane": "^1.3.3",
     "semver": "^5.1.0",
-    "systemjs": "0.20.0-alpha.1",
+    "systemjs": "0.20.0-rc.8",
     "systemjs-builder": "0.16.0-alpha.1",
     "traceur": "0.0.105",
     "uglify-js": "^2.6.1"
diff --git a/testlibs/jspm.browser.js b/testlibs/jspm.browser.js
index fe37f4904..332e10b9e 100644
--- a/testlibs/jspm.browser.js
+++ b/testlibs/jspm.browser.js
@@ -3,5 +3,183 @@ SystemJS.config({
   paths: {
     "github:": "jspm_packages/github/",
     "npm:": "jspm_packages/npm/"
+  },
+  bundles: {
+    "build.js": [
+      "npm:voxel-demo@0.0.1/shader.js",
+      "npm:voxel-demo@0.0.1.json",
+      "npm:ao-shader@0.2.3/aoshader.js",
+      "npm:ao-shader@0.2.3.json",
+      "npm:gl-shader@0.0.6/index.js",
+      "npm:gl-shader@0.0.6.json",
+      "npm:uniq@0.0.2/uniq.js",
+      "npm:uniq@0.0.2.json",
+      "npm:glsl-exports@0.0.0/index.js",
+      "npm:glsl-exports@0.0.0.json",
+      "npm:through@2.3.8/index.js",
+      "npm:through@2.3.8.json",
+      "npm:jspm-nodelibs-process@0.2.0/process.js",
+      "npm:jspm-nodelibs-process@0.2.0.json",
+      "npm:stream-browserify@2.0.1/index.js",
+      "npm:stream-browserify@2.0.1.json",
+      "npm:readable-stream@2.0.5/passthrough.js",
+      "npm:readable-stream@2.0.5.json",
+      "npm:readable-stream@2.0.5/lib/_stream_passthrough.js",
+      "npm:inherits@2.0.1/inherits_browser.js",
+      "npm:inherits@2.0.1.json",
+      "npm:core-util-is@1.0.2/lib/util.js",
+      "npm:core-util-is@1.0.2.json",
+      "npm:jspm-nodelibs-buffer@0.2.1/global.js",
+      "npm:jspm-nodelibs-buffer@0.2.1.json",
+      "npm:buffer@4.9.1/index.js",
+      "npm:buffer@4.9.1.json",
+      "npm:isarray@1.0.0/index.js",
+      "npm:isarray@1.0.0.json",
+      "npm:ieee754@1.1.8/index.js",
+      "npm:ieee754@1.1.8.json",
+      "npm:base64-js@1.2.0/index.js",
+      "npm:base64-js@1.2.0.json",
+      "npm:readable-stream@2.0.5/lib/_stream_transform.js",
+      "npm:readable-stream@2.0.5/lib/_stream_duplex.js",
+      "npm:readable-stream@2.0.5/lib/_stream_writable.js",
+      "npm:jspm-nodelibs-events@0.2.0/events.js",
+      "npm:jspm-nodelibs-events@0.2.0.json",
+      "npm:util-deprecate@1.0.2/browser.js",
+      "npm:util-deprecate@1.0.2.json",
+      "npm:process-nextick-args@1.0.6/index.js",
+      "npm:process-nextick-args@1.0.6.json",
+      "npm:readable-stream@2.0.5/lib/_stream_readable.js",
+      "npm:string_decoder@0.10.31/index.js",
+      "npm:string_decoder@0.10.31.json",
+      "npm:isarray@0.0.1/index.js",
+      "npm:isarray@0.0.1.json",
+      "npm:readable-stream@2.0.5/transform.js",
+      "npm:readable-stream@2.0.5/duplex.js",
+      "npm:readable-stream@2.0.5/writable.js",
+      "npm:readable-stream@2.0.5/readable.js",
+      "npm:jspm-nodelibs-stream@0.2.0.json",
+      "npm:glsl-parser@0.0.9/index.js",
+      "npm:glsl-parser@0.0.9.json",
+      "npm:glsl-parser@0.0.9/lib/index.js",
+      "npm:glsl-parser@0.0.9/lib/scope.js",
+      "npm:glsl-parser@0.0.9/lib/expr.js",
+      "npm:through@1.1.2/index.js",
+      "npm:through@1.1.2.json",
+      "npm:glsl-tokenizer@0.0.9/index.js",
+      "npm:glsl-tokenizer@0.0.9.json",
+      "npm:glsl-tokenizer@0.0.9/lib/builtins.js",
+      "npm:glsl-tokenizer@0.0.9/lib/operators.js",
+      "npm:glsl-tokenizer@0.0.9/lib/literals.js",
+      "npm:jspm-nodelibs-fs@0.2.0/fs.js",
+      "npm:jspm-nodelibs-fs@0.2.0.json",
+      "npm:ao-mesher@0.2.10/mesh.js",
+      "npm:ao-mesher@0.2.10.json",
+      "npm:typedarray-pool@0.1.2/pool.js",
+      "npm:typedarray-pool@0.1.2.json",
+      "npm:dup@0.0.0/dup.js",
+      "npm:dup@0.0.0.json",
+      "npm:bit-twiddle@0.0.2/twiddle.js",
+      "npm:bit-twiddle@0.0.2.json",
+      "npm:greedy-mesher@1.0.2/greedy.js",
+      "npm:greedy-mesher@1.0.2.json",
+      "npm:iota-array@1.0.0/iota.js",
+      "npm:iota-array@1.0.0.json",
+      "npm:uniq@1.0.1/uniq.js",
+      "npm:uniq@1.0.1.json",
+      "npm:typedarray-pool@1.1.0/pool.js",
+      "npm:typedarray-pool@1.1.0.json",
+      "npm:dup@1.0.0/dup.js",
+      "npm:dup@1.0.0.json",
+      "npm:bit-twiddle@1.0.2/twiddle.js",
+      "npm:bit-twiddle@1.0.2.json",
+      "npm:cwise-compiler@0.1.0/compiler.js",
+      "npm:cwise-compiler@0.1.0.json",
+      "npm:cwise-compiler@0.1.0/lib/thunk.js",
+      "npm:cwise-compiler@0.1.0/lib/compile.js",
+      "npm:ndarray@1.0.18/ndarray.js",
+      "npm:ndarray@1.0.18.json",
+      "npm:is-buffer@1.1.1/index.js",
+      "npm:is-buffer@1.1.1.json",
+      "npm:ndarray-ops@1.1.1/ndarray-ops.js",
+      "npm:ndarray-ops@1.1.1.json",
+      "npm:cwise-compiler@0.0.0/compiler.js",
+      "npm:cwise-compiler@0.0.0.json",
+      "npm:cwise-compiler@0.0.0/lib/thunk.js",
+      "npm:cwise-compiler@0.0.0/lib/compile.js",
+      "npm:ndarray-fill@0.1.0/index.js",
+      "npm:ndarray-fill@0.1.0.json",
+      "npm:cwise@0.3.4/cwise.js",
+      "npm:cwise@0.3.4.json",
+      "npm:cwise-parser@0.0.1/index.js",
+      "npm:cwise-parser@0.0.1.json",
+      "npm:esprima@1.0.4/esprima.js",
+      "npm:esprima@1.0.4.json",
+      "npm:gl-matrix@2.0.0/dist/gl-matrix.js",
+      "npm:gl-matrix@2.0.0.json",
+      "npm:gl-vao@0.0.3/vao.js",
+      "npm:gl-vao@0.0.3.json",
+      "npm:gl-vao@0.0.3/lib/vao-emulated.js",
+      "npm:gl-vao@0.0.3/lib/do-bind.js",
+      "npm:gl-vao@0.0.3/lib/vao-native.js",
+      "npm:webglew@0.0.0/webglew.js",
+      "npm:webglew@0.0.0.json",
+      "npm:gl-buffer@0.1.2/buffer.js",
+      "npm:gl-buffer@0.1.2.json",
+      "npm:gl-tile-map@0.3.0/tilemap.js",
+      "npm:gl-tile-map@0.3.0.json",
+      "npm:gl-texture2d@0.1.12/texture.js",
+      "npm:gl-texture2d@0.1.12.json",
+      "npm:tile-mip-map@0.2.1/mipmap.js",
+      "npm:tile-mip-map@0.2.1.json",
+      "npm:ndarray-downsample2x@0.1.1/downsample.js",
+      "npm:ndarray-downsample2x@0.1.1.json",
+      "npm:ndarray-scratch@0.0.1/scratch.js",
+      "npm:ndarray-scratch@0.0.1.json",
+      "npm:ndarray-fft@0.1.0/fft.js",
+      "npm:ndarray-fft@0.1.0.json",
+      "npm:ndarray-fft@0.1.0/lib/fft-matrix.js",
+      "npm:gl-now@0.0.4/index.js",
+      "npm:gl-now@0.0.4.json",
+      "npm:game-shell@0.1.4/shell.js",
+      "npm:game-shell@0.1.4.json",
+      "npm:game-shell@0.1.4/lib/hrtime-polyfill.js",
+      "npm:game-shell@0.1.4/lib/mousewheel-polyfill.js",
+      "npm:game-shell@0.1.4/lib/raf-polyfill.js",
+      "npm:iota-array@0.0.1/iota.js",
+      "npm:iota-array@0.0.1.json",
+      "npm:lower-bound@0.0.3/lb.js",
+      "npm:lower-bound@0.0.3.json",
+      "npm:invert-hash@0.0.0/invert.js",
+      "npm:invert-hash@0.0.0.json",
+      "npm:vkey@0.0.3/index.js",
+      "npm:vkey@0.0.3.json",
+      "npm:domready@0.2.13/ready.js",
+      "npm:domready@0.2.13.json",
+      "npm:jspm-nodelibs-util@0.2.1/util.js",
+      "npm:jspm-nodelibs-util@0.2.1.json",
+      "npm:jspm-nodelibs-util@0.2.1/isBufferBrowser.js",
+      "main.js",
+      "tests/tests.js",
+      "tests/voxel-demo.js",
+      "tests/d3.js",
+      "github:d3/d3@3.5.17/d3.js",
+      "github:d3/d3@3.5.17.json",
+      "tests/jquery.js",
+      "github:components/jquery@2.1.4/jquery.js",
+      "github:components/jquery@2.1.4.json",
+      "tests/bootstrap.js",
+      "tests/bootstrap.html!github:systemjs/plugin-text@0.0.2/text.js",
+      "github:systemjs/plugin-text@0.0.2.json",
+      "github:twbs/bootstrap@3.3.7/dist/css/bootstrap.css!github:systemjs/plugin-css@0.1.32/css.js",
+      "github:twbs/bootstrap@3.3.7.json",
+      "github:systemjs/plugin-css@0.1.32.json",
+      "github:twbs/bootstrap@3.3.7/dist/js/bootstrap.js",
+      "tests/angular.js",
+      "github:angular/bower-angular@1.6.1/angular.js",
+      "github:angular/bower-angular@1.6.1.json",
+      "npm:mocha@1.21.5/mocha.js",
+      "npm:mocha@1.21.5.json",
+      "npm:mocha@1.21.5/mocha.css!github:systemjs/plugin-css@0.1.32/css.js"
+    ]
   }
 });
\ No newline at end of file
diff --git a/testlibs/jspm.config.js b/testlibs/jspm.config.js
index 0f440aac9..a14a80572 100644
--- a/testlibs/jspm.config.js
+++ b/testlibs/jspm.config.js
@@ -14,20 +14,20 @@ SystemJS.config({
     "github:*/*.json"
   ],
   map: {
-    "angular": "github:angular/bower-angular@1.4.8",
+    "angular": "github:angular/bower-angular@1.6.1",
     "assert": "npm:jspm-nodelibs-assert@0.2.0",
-    "bootstrap": "github:twbs/bootstrap@3.3.6",
-    "buffer": "npm:jspm-nodelibs-buffer@0.2.0",
-    "builder": "npm:systemjs-builder@0.15.18",
+    "bootstrap": "github:twbs/bootstrap@3.3.7",
+    "buffer": "npm:jspm-nodelibs-buffer@0.2.1",
+    "builder": "npm:systemjs-builder@0.15.35",
     "child_process": "npm:jspm-nodelibs-child_process@0.2.0",
-    "clean-css": "npm:clean-css@3.4.9",
+    "clean-css": "npm:clean-css@3.4.24",
     "cluster": "npm:jspm-nodelibs-cluster@0.2.0",
-    "console": "npm:jspm-nodelibs-console@0.2.0",
+    "console": "npm:jspm-nodelibs-console@0.2.2",
     "constants": "npm:jspm-nodelibs-constants@0.2.0",
-    "core-js": "npm:core-js@1.2.6",
+    "core-js": "npm:core-js@1.2.7",
     "crypto": "npm:jspm-nodelibs-crypto@0.2.0",
-    "css": "github:systemjs/plugin-css@0.1.20",
-    "d3": "github:mbostock/d3@3.5.12",
+    "css": "github:systemjs/plugin-css@0.1.32",
+    "d3": "github:d3/d3@3.5.17",
     "dgram": "npm:jspm-nodelibs-dgram@0.2.0",
     "dns": "npm:jspm-nodelibs-dns@0.2.0",
     "domain": "npm:jspm-nodelibs-domain@0.2.0",
@@ -35,27 +35,27 @@ SystemJS.config({
     "ember": "github:components/ember@1.13.2",
     "events": "npm:jspm-nodelibs-events@0.2.0",
     "fs": "npm:jspm-nodelibs-fs@0.2.0",
-    "github": "npm:jspm-github@0.14.7",
+    "github": "npm:jspm-github@0.14.11",
     "http": "npm:jspm-nodelibs-http@0.2.0",
-    "https": "npm:jspm-nodelibs-https@0.2.0",
+    "https": "npm:jspm-nodelibs-https@0.2.1",
     "jodid25519": "npm:jodid25519@1.0.2",
     "jquery": "github:components/jquery@2.1.4",
     "jsbn": "npm:jsbn@0.1.0",
     "jspm": "github:jspm/jspm-cli@0.17",
-    "jspm-registry": "npm:jspm-registry@0.4.0",
+    "jspm-registry": "npm:jspm-registry@0.4.3",
     "mocha": "npm:mocha@1.21.5",
     "module": "npm:jspm-nodelibs-module@0.2.0",
     "net": "npm:jspm-nodelibs-net@0.2.0",
-    "npm": "npm:jspm-npm@0.28.12",
+    "npm": "npm:jspm-npm@0.27.3",
     "os": "npm:jspm-nodelibs-os@0.2.0",
-    "path": "npm:jspm-nodelibs-path@0.2.0",
+    "path": "npm:jspm-nodelibs-path@0.2.1",
     "process": "npm:jspm-nodelibs-process@0.2.0",
     "punycode": "npm:jspm-nodelibs-punycode@0.2.0",
     "querystring": "npm:jspm-nodelibs-querystring@0.2.0",
     "readline": "npm:jspm-nodelibs-readline@0.2.0",
     "repl": "npm:jspm-nodelibs-repl@0.2.0",
     "rsvp": "npm:rsvp@3.1.0",
-    "source-map": "npm:source-map@0.5.3",
+    "source-map": "npm:source-map@0.5.6",
     "sshpk": "npm:sshpk@1.7.3",
     "stream": "npm:jspm-nodelibs-stream@0.2.0",
     "string_decoder": "npm:jspm-nodelibs-string_decoder@0.2.0",
@@ -64,12 +64,12 @@ SystemJS.config({
     "timers": "npm:jspm-nodelibs-timers@0.2.0",
     "tls": "npm:jspm-nodelibs-tls@0.2.0",
     "tty": "npm:jspm-nodelibs-tty@0.2.0",
-    "tweetnacl": "npm:tweetnacl@0.14.1",
+    "tweetnacl": "npm:tweetnacl@0.14.5",
     "url": "npm:jspm-nodelibs-url@0.2.0",
-    "util": "npm:jspm-nodelibs-util@0.2.0",
+    "util": "npm:jspm-nodelibs-util@0.2.1",
     "vm": "npm:jspm-nodelibs-vm@0.2.0",
     "voxel-demo": "npm:voxel-demo@0.0.1",
-    "zlib": "npm:jspm-nodelibs-zlib@0.2.0"
+    "zlib": "npm:jspm-nodelibs-zlib@0.2.2"
   },
   packages: {
     "npm:asn1.js@4.5.1": {
@@ -169,13 +169,6 @@ SystemJS.config({
         "node-int64": "npm:node-int64@0.4.0"
       }
     },
-    "npm:buffer@4.5.0": {
-      "map": {
-        "base64-js": "npm:base64-js@1.1.1",
-        "ieee754": "npm:ieee754@1.1.6",
-        "isarray": "npm:isarray@1.0.0"
-      }
-    },
     "npm:dashdash@1.13.0": {
       "map": {
         "assert-plus": "npm:assert-plus@1.0.0"
@@ -302,7 +295,7 @@ SystemJS.config({
     },
     "npm:mocha@1.21.5": {
       "map": {
-        "css": "github:systemjs/plugin-css@0.1.20"
+        "css": "github:systemjs/plugin-css@0.1.32"
       }
     },
     "npm:repeating@1.1.3": {
@@ -355,11 +348,6 @@ SystemJS.config({
     "npm:string_decoder@0.10.31": {
       "map": {}
     },
-    "github:twbs/bootstrap@3.3.6": {
-      "map": {
-        "jquery": "github:components/jquery@2.1.4"
-      }
-    },
     "npm:align-text@0.1.3": {
       "map": {
         "kind-of": "npm:kind-of@2.0.1",
@@ -465,12 +453,6 @@ SystemJS.config({
         "inherits": "npm:inherits@2.0.1"
       }
     },
-    "npm:clean-css@3.4.9": {
-      "map": {
-        "commander": "npm:commander@2.8.1",
-        "source-map": "npm:source-map@0.4.4"
-      }
-    },
     "npm:cliui@2.1.0": {
       "map": {
         "center-align": "npm:center-align@0.1.2",
@@ -1408,11 +1390,6 @@ SystemJS.config({
         "babel-template": "npm:babel-template@6.9.0"
       }
     },
-    "npm:jspm-nodelibs-http@0.2.0": {
-      "map": {
-        "http-browserify": "npm:stream-http@2.0.5"
-      }
-    },
     "npm:jspm-nodelibs-domain@0.2.0": {
       "map": {
         "domain-browserify": "npm:domain-browser@1.1.7"
@@ -1433,11 +1410,6 @@ SystemJS.config({
         "os-browserify": "npm:os-browserify@0.2.0"
       }
     },
-    "npm:jspm-nodelibs-buffer@0.2.0": {
-      "map": {
-        "buffer-browserify": "npm:buffer@4.5.0"
-      }
-    },
     "npm:jspm-nodelibs-url@0.2.0": {
       "map": {
         "url-browserify": "npm:url@0.11.0"
@@ -1453,15 +1425,526 @@ SystemJS.config({
         "punycode-browserify": "npm:punycode@1.3.2"
       }
     },
-    "npm:jspm-nodelibs-zlib@0.2.0": {
+    "npm:jspm-nodelibs-timers@0.2.0": {
       "map": {
-        "zlib-browserify": "npm:browserify-zlib@0.1.4"
+        "timers-browserify": "npm:timers-browserify@1.4.2"
       }
     },
-    "npm:jspm-nodelibs-timers@0.2.0": {
+    "npm:jspm-nodelibs-http@0.2.0": {
       "map": {
-        "timers-browserify": "npm:timers-browserify@1.4.2"
+        "http-browserify": "npm:stream-http@2.0.5"
+      }
+    },
+    "npm:systemjs-builder@0.15.35": {
+      "map": {
+        "rollup": "npm:rollup@0.36.4",
+        "systemjs": "npm:systemjs@0.19.43",
+        "babel-core": "npm:babel-core@6.22.1",
+        "babel-plugin-transform-es2015-modules-systemjs": "npm:babel-plugin-transform-es2015-modules-systemjs@6.22.0",
+        "bluebird": "npm:bluebird@3.4.7",
+        "data-uri-to-buffer": "npm:data-uri-to-buffer@0.0.4",
+        "es6-template-strings": "npm:es6-template-strings@2.0.1",
+        "glob": "npm:glob@7.1.1",
+        "mkdirp": "npm:mkdirp@0.5.1",
+        "traceur": "npm:traceur@0.0.105",
+        "uglify-js": "npm:uglify-js@2.7.5",
+        "source-map": "npm:source-map@0.5.6",
+        "babel-plugin-transform-system-register": "npm:babel-plugin-transform-system-register@0.0.1",
+        "babel-plugin-transform-cjs-system-wrapper": "npm:babel-plugin-transform-cjs-system-wrapper@0.3.0",
+        "babel-plugin-transform-global-system-wrapper": "npm:babel-plugin-transform-global-system-wrapper@0.0.1"
+      }
+    },
+    "npm:jspm-npm@0.27.3": {
+      "map": {
+        "traceur": "npm:traceur@0.0.95",
+        "bluebird": "npm:bluebird@3.4.7",
+        "graceful-fs": "npm:graceful-fs@3.0.11",
+        "mkdirp": "npm:mkdirp@0.5.1",
+        "readdirp": "npm:readdirp@2.1.0",
+        "request": "npm:request@2.58.0",
+        "rmdir": "npm:rmdir@1.1.0",
+        "semver": "npm:semver@5.3.0",
+        "tar": "npm:tar@1.0.3",
+        "which": "npm:which@1.2.12",
+        "systemjs-builder": "npm:systemjs-builder@0.15.35"
+      }
+    },
+    "npm:jspm-nodelibs-zlib@0.2.2": {
+      "map": {
+        "browserify-zlib": "npm:browserify-zlib@0.1.4"
+      }
+    },
+    "npm:clean-css@3.4.24": {
+      "map": {
+        "commander": "npm:commander@2.8.1",
+        "source-map": "npm:source-map@0.4.4"
+      }
+    },
+    "npm:traceur@0.0.95": {
+      "map": {
+        "commander": "npm:commander@2.6.0",
+        "glob": "npm:glob@4.3.5",
+        "semver": "npm:semver@2.3.2",
+        "rsvp": "npm:rsvp@3.1.0",
+        "source-map-support": "npm:source-map-support@0.2.10"
+      }
+    },
+    "npm:systemjs@0.19.43": {
+      "map": {
+        "when": "npm:when@3.7.7"
+      }
+    },
+    "npm:jspm-github@0.14.11": {
+      "map": {
+        "request": "npm:request@2.79.0",
+        "rimraf": "npm:rimraf@2.5.4",
+        "expand-tilde": "npm:expand-tilde@1.2.2",
+        "graceful-fs": "npm:graceful-fs@4.1.11",
+        "mkdirp": "npm:mkdirp@0.5.1",
+        "netrc": "npm:netrc@0.1.4",
+        "bluebird": "npm:bluebird@3.4.7",
+        "semver": "npm:semver@5.3.0",
+        "which": "npm:which@1.2.12",
+        "tar-fs": "npm:tar-fs@1.15.0"
+      }
+    },
+    "npm:jspm-nodelibs-buffer@0.2.1": {
+      "map": {
+        "buffer": "npm:buffer@4.9.1"
+      }
+    },
+    "npm:jspm-registry@0.4.3": {
+      "map": {
+        "graceful-fs": "npm:graceful-fs@4.1.11",
+        "rsvp": "npm:rsvp@3.1.0",
+        "semver": "npm:semver@4.3.6",
+        "rimraf": "npm:rimraf@2.5.4"
+      }
+    },
+    "npm:glob@4.3.5": {
+      "map": {
+        "inflight": "npm:inflight@1.0.6",
+        "inherits": "npm:inherits@2.0.3",
+        "minimatch": "npm:minimatch@2.0.10",
+        "once": "npm:once@1.4.0"
+      }
+    },
+    "npm:rollup@0.36.4": {
+      "map": {
+        "source-map-support": "npm:source-map-support@0.4.10"
+      }
+    },
+    "npm:babel-plugin-transform-es2015-modules-systemjs@6.22.0": {
+      "map": {
+        "babel-template": "npm:babel-template@6.22.0",
+        "babel-helper-hoist-variables": "npm:babel-helper-hoist-variables@6.22.0",
+        "babel-runtime": "npm:babel-runtime@6.22.0"
+      }
+    },
+    "npm:es6-template-strings@2.0.1": {
+      "map": {
+        "es5-ext": "npm:es5-ext@0.10.12",
+        "esniff": "npm:esniff@1.1.0"
+      }
+    },
+    "npm:glob@7.1.1": {
+      "map": {
+        "minimatch": "npm:minimatch@3.0.3",
+        "path-is-absolute": "npm:path-is-absolute@1.0.1",
+        "inflight": "npm:inflight@1.0.6",
+        "inherits": "npm:inherits@2.0.3",
+        "once": "npm:once@1.4.0",
+        "fs.realpath": "npm:fs.realpath@1.0.0"
+      }
+    },
+    "npm:readdirp@2.1.0": {
+      "map": {
+        "minimatch": "npm:minimatch@3.0.3",
+        "readable-stream": "npm:readable-stream@2.2.2",
+        "graceful-fs": "npm:graceful-fs@4.1.11",
+        "set-immediate-shim": "npm:set-immediate-shim@1.0.1"
+      }
+    },
+    "npm:babel-core@6.22.1": {
+      "map": {
+        "babel-code-frame": "npm:babel-code-frame@6.22.0",
+        "babel-generator": "npm:babel-generator@6.22.0",
+        "babel-helpers": "npm:babel-helpers@6.22.0",
+        "babel-messages": "npm:babel-messages@6.22.0",
+        "babel-template": "npm:babel-template@6.22.0",
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "babel-register": "npm:babel-register@6.22.0",
+        "babel-traverse": "npm:babel-traverse@6.22.1",
+        "babel-types": "npm:babel-types@6.22.0",
+        "babylon": "npm:babylon@6.15.0",
+        "json5": "npm:json5@0.5.1",
+        "minimatch": "npm:minimatch@3.0.3",
+        "convert-source-map": "npm:convert-source-map@1.3.0",
+        "debug": "npm:debug@2.6.0",
+        "lodash": "npm:lodash@4.17.4",
+        "path-is-absolute": "npm:path-is-absolute@1.0.1",
+        "private": "npm:private@0.1.6",
+        "slash": "npm:slash@1.0.0",
+        "source-map": "npm:source-map@0.5.6"
+      }
+    },
+    "npm:uglify-js@2.7.5": {
+      "map": {
+        "async": "npm:async@0.2.10",
+        "source-map": "npm:source-map@0.5.6",
+        "uglify-to-browserify": "npm:uglify-to-browserify@1.0.2",
+        "yargs": "npm:yargs@3.10.0"
+      }
+    },
+    "npm:request@2.79.0": {
+      "map": {
+        "form-data": "npm:form-data@2.1.2",
+        "har-validator": "npm:har-validator@2.0.6",
+        "hawk": "npm:hawk@3.1.3",
+        "oauth-sign": "npm:oauth-sign@0.8.2",
+        "qs": "npm:qs@6.3.0",
+        "tough-cookie": "npm:tough-cookie@2.3.2",
+        "aws-sign2": "npm:aws-sign2@0.6.0",
+        "caseless": "npm:caseless@0.11.0",
+        "combined-stream": "npm:combined-stream@1.0.5",
+        "extend": "npm:extend@3.0.0",
+        "forever-agent": "npm:forever-agent@0.6.1",
+        "http-signature": "npm:http-signature@1.1.1",
+        "is-typedarray": "npm:is-typedarray@1.0.0",
+        "isstream": "npm:isstream@0.1.2",
+        "json-stringify-safe": "npm:json-stringify-safe@5.0.1",
+        "mime-types": "npm:mime-types@2.1.14",
+        "stringstream": "npm:stringstream@0.0.5",
+        "tunnel-agent": "npm:tunnel-agent@0.4.3",
+        "aws4": "npm:aws4@1.5.0",
+        "uuid": "npm:uuid@3.0.1"
+      }
+    },
+    "npm:rimraf@2.5.4": {
+      "map": {
+        "glob": "npm:glob@7.1.1"
+      }
+    },
+    "npm:buffer@4.9.1": {
+      "map": {
+        "base64-js": "npm:base64-js@1.2.0",
+        "ieee754": "npm:ieee754@1.1.8",
+        "isarray": "npm:isarray@1.0.0"
+      }
+    },
+    "npm:debug@2.6.0": {
+      "map": {
+        "ms": "npm:ms@0.7.2"
+      }
+    },
+    "npm:once@1.4.0": {
+      "map": {
+        "wrappy": "npm:wrappy@1.0.2"
+      }
+    },
+    "npm:inflight@1.0.6": {
+      "map": {
+        "once": "npm:once@1.4.0",
+        "wrappy": "npm:wrappy@1.0.2"
+      }
+    },
+    "npm:esniff@1.1.0": {
+      "map": {
+        "d": "npm:d@1.0.0",
+        "es5-ext": "npm:es5-ext@0.10.12"
+      }
+    },
+    "npm:babel-code-frame@6.22.0": {
+      "map": {
+        "js-tokens": "npm:js-tokens@3.0.0",
+        "chalk": "npm:chalk@1.1.3",
+        "esutils": "npm:esutils@2.0.2"
+      }
+    },
+    "npm:es5-ext@0.10.12": {
+      "map": {
+        "es6-symbol": "npm:es6-symbol@3.1.0",
+        "es6-iterator": "npm:es6-iterator@2.0.0"
+      }
+    },
+    "npm:babel-register@6.22.0": {
+      "map": {
+        "home-or-tmp": "npm:home-or-tmp@2.0.0",
+        "babel-core": "npm:babel-core@6.22.1",
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "core-js": "npm:core-js@2.4.1",
+        "lodash": "npm:lodash@4.17.4",
+        "mkdirp": "npm:mkdirp@0.5.1",
+        "source-map-support": "npm:source-map-support@0.4.10"
+      }
+    },
+    "npm:babel-traverse@6.22.1": {
+      "map": {
+        "globals": "npm:globals@9.14.0",
+        "babel-code-frame": "npm:babel-code-frame@6.22.0",
+        "babel-messages": "npm:babel-messages@6.22.0",
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "babel-types": "npm:babel-types@6.22.0",
+        "babylon": "npm:babylon@6.15.0",
+        "invariant": "npm:invariant@2.2.2",
+        "lodash": "npm:lodash@4.17.4",
+        "debug": "npm:debug@2.6.0"
+      }
+    },
+    "npm:babel-generator@6.22.0": {
+      "map": {
+        "detect-indent": "npm:detect-indent@4.0.0",
+        "babel-messages": "npm:babel-messages@6.22.0",
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "babel-types": "npm:babel-types@6.22.0",
+        "lodash": "npm:lodash@4.17.4",
+        "source-map": "npm:source-map@0.5.6",
+        "jsesc": "npm:jsesc@1.3.0"
+      }
+    },
+    "npm:babel-template@6.22.0": {
+      "map": {
+        "babylon": "npm:babylon@6.15.0",
+        "babel-traverse": "npm:babel-traverse@6.22.1",
+        "babel-types": "npm:babel-types@6.22.0",
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "lodash": "npm:lodash@4.17.4"
+      }
+    },
+    "npm:source-map-support@0.4.10": {
+      "map": {
+        "source-map": "npm:source-map@0.5.6"
+      }
+    },
+    "npm:babel-helper-hoist-variables@6.22.0": {
+      "map": {
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "babel-types": "npm:babel-types@6.22.0"
+      }
+    },
+    "npm:minimatch@3.0.3": {
+      "map": {
+        "brace-expansion": "npm:brace-expansion@1.1.6"
+      }
+    },
+    "npm:babel-runtime@6.22.0": {
+      "map": {
+        "core-js": "npm:core-js@2.4.1",
+        "regenerator-runtime": "npm:regenerator-runtime@0.10.1"
+      }
+    },
+    "npm:babel-types@6.22.0": {
+      "map": {
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "esutils": "npm:esutils@2.0.2",
+        "lodash": "npm:lodash@4.17.4",
+        "to-fast-properties": "npm:to-fast-properties@1.0.2"
+      }
+    },
+    "npm:babel-helpers@6.22.0": {
+      "map": {
+        "babel-runtime": "npm:babel-runtime@6.22.0",
+        "babel-template": "npm:babel-template@6.22.0"
+      }
+    },
+    "npm:babel-messages@6.22.0": {
+      "map": {
+        "babel-runtime": "npm:babel-runtime@6.22.0"
+      }
+    },
+    "npm:readable-stream@2.2.2": {
+      "map": {
+        "core-util-is": "npm:core-util-is@1.0.2",
+        "isarray": "npm:isarray@1.0.0",
+        "process-nextick-args": "npm:process-nextick-args@1.0.7",
+        "string_decoder": "npm:string_decoder@0.10.31",
+        "util-deprecate": "npm:util-deprecate@1.0.2",
+        "inherits": "npm:inherits@2.0.3",
+        "buffer-shims": "npm:buffer-shims@1.0.0"
+      }
+    },
+    "npm:har-validator@2.0.6": {
+      "map": {
+        "is-my-json-valid": "npm:is-my-json-valid@2.15.0",
+        "commander": "npm:commander@2.9.0",
+        "pinkie-promise": "npm:pinkie-promise@2.0.1",
+        "chalk": "npm:chalk@1.1.3"
+      }
+    },
+    "npm:tough-cookie@2.3.2": {
+      "map": {
+        "punycode": "npm:punycode@1.4.1"
+      }
+    },
+    "npm:mime-types@2.1.14": {
+      "map": {
+        "mime-db": "npm:mime-db@1.26.0"
+      }
+    },
+    "npm:form-data@2.1.2": {
+      "map": {
+        "combined-stream": "npm:combined-stream@1.0.5",
+        "mime-types": "npm:mime-types@2.1.14",
+        "asynckit": "npm:asynckit@0.4.0"
+      }
+    },
+    "npm:hawk@3.1.3": {
+      "map": {
+        "hoek": "npm:hoek@2.16.3",
+        "boom": "npm:boom@2.10.1",
+        "cryptiles": "npm:cryptiles@2.0.5",
+        "sntp": "npm:sntp@1.0.9"
+      }
+    },
+    "npm:http-signature@1.1.1": {
+      "map": {
+        "assert-plus": "npm:assert-plus@0.2.0",
+        "jsprim": "npm:jsprim@1.3.1",
+        "sshpk": "npm:sshpk@1.7.3"
+      }
+    },
+    "npm:detect-indent@4.0.0": {
+      "map": {
+        "repeating": "npm:repeating@2.0.1"
+      }
+    },
+    "npm:d@1.0.0": {
+      "map": {
+        "es5-ext": "npm:es5-ext@0.10.12"
+      }
+    },
+    "npm:home-or-tmp@2.0.0": {
+      "map": {
+        "os-tmpdir": "npm:os-tmpdir@1.0.2",
+        "os-homedir": "npm:os-homedir@1.0.2"
+      }
+    },
+    "npm:es6-symbol@3.1.0": {
+      "map": {
+        "d": "npm:d@0.1.1",
+        "es5-ext": "npm:es5-ext@0.10.12"
+      }
+    },
+    "npm:chalk@1.1.3": {
+      "map": {
+        "ansi-styles": "npm:ansi-styles@2.2.1",
+        "escape-string-regexp": "npm:escape-string-regexp@1.0.5",
+        "has-ansi": "npm:has-ansi@2.0.0",
+        "strip-ansi": "npm:strip-ansi@3.0.1",
+        "supports-color": "npm:supports-color@2.0.0"
+      }
+    },
+    "npm:brace-expansion@1.1.6": {
+      "map": {
+        "balanced-match": "npm:balanced-match@0.4.2",
+        "concat-map": "npm:concat-map@0.0.1"
+      }
+    },
+    "npm:invariant@2.2.2": {
+      "map": {
+        "loose-envify": "npm:loose-envify@1.3.1"
+      }
+    },
+    "npm:graceful-fs@3.0.11": {
+      "map": {
+        "natives": "npm:natives@1.1.0"
+      }
+    },
+    "github:twbs/bootstrap@3.3.7": {
+      "map": {
+        "jquery": "github:components/jquery@2.1.4"
+      }
+    },
+    "npm:which@1.2.12": {
+      "map": {
+        "isexe": "npm:isexe@1.1.2"
+      }
+    },
+    "npm:expand-tilde@1.2.2": {
+      "map": {
+        "os-homedir": "npm:os-homedir@1.0.2"
+      }
+    },
+    "npm:babel-plugin-transform-cjs-system-wrapper@0.3.0": {
+      "map": {
+        "babel-template": "npm:babel-template@6.22.0"
+      }
+    },
+    "npm:is-my-json-valid@2.15.0": {
+      "map": {
+        "jsonpointer": "npm:jsonpointer@4.0.1",
+        "generate-function": "npm:generate-function@2.0.0",
+        "generate-object-property": "npm:generate-object-property@1.2.0",
+        "xtend": "npm:xtend@4.0.1"
+      }
+    },
+    "npm:jsprim@1.3.1": {
+      "map": {
+        "json-schema": "npm:json-schema@0.2.3",
+        "extsprintf": "npm:extsprintf@1.0.2",
+        "verror": "npm:verror@1.3.6"
+      }
+    },
+    "npm:pinkie-promise@2.0.1": {
+      "map": {
+        "pinkie": "npm:pinkie@2.0.4"
+      }
+    },
+    "npm:tar-fs@1.15.0": {
+      "map": {
+        "mkdirp": "npm:mkdirp@0.5.1",
+        "tar-stream": "npm:tar-stream@1.5.2",
+        "pump": "npm:pump@1.0.2"
+      }
+    },
+    "npm:repeating@2.0.1": {
+      "map": {
+        "is-finite": "npm:is-finite@1.0.2"
+      }
+    },
+    "npm:loose-envify@1.3.1": {
+      "map": {
+        "js-tokens": "npm:js-tokens@3.0.0"
+      }
+    },
+    "npm:strip-ansi@3.0.1": {
+      "map": {
+        "ansi-regex": "npm:ansi-regex@2.1.1"
+      }
+    },
+    "npm:babel-plugin-transform-global-system-wrapper@0.0.1": {
+      "map": {
+        "babel-template": "npm:babel-template@6.22.0"
+      }
+    },
+    "npm:is-finite@1.0.2": {
+      "map": {
+        "number-is-nan": "npm:number-is-nan@1.0.1"
+      }
+    },
+    "npm:tar-stream@1.5.2": {
+      "map": {
+        "bl": "npm:bl@1.2.0",
+        "readable-stream": "npm:readable-stream@2.2.2",
+        "xtend": "npm:xtend@4.0.1",
+        "end-of-stream": "npm:end-of-stream@1.1.0"
+      }
+    },
+    "npm:pump@1.0.2": {
+      "map": {
+        "once": "npm:once@1.4.0",
+        "end-of-stream": "npm:end-of-stream@1.1.0"
+      }
+    },
+    "npm:bl@1.2.0": {
+      "map": {
+        "readable-stream": "npm:readable-stream@2.2.2"
+      }
+    },
+    "npm:end-of-stream@1.1.0": {
+      "map": {
+        "once": "npm:once@1.3.3"
       }
     }
   }
-});
\ No newline at end of file
+});
diff --git a/testlibs/package.json b/testlibs/package.json
index 50f28fcbf..97b602ed2 100644
--- a/testlibs/package.json
+++ b/testlibs/package.json
@@ -5,10 +5,10 @@
     "bootstrap": "twbs/bootstrap@^3.3.6",
     "builder": "npm:systemjs-builder@^0.15",
     "clean-css": "npm:clean-css@^3.4.8",
-    "css": "systemjs/plugin-css@^0.1.20",
+    "css": "systemjs/plugin-css@^0.1.32",
     "d3": "d3/d3@^3.5.9",
     "ember": "components/ember@1.13.2",
-    "github": "npm:jspm-github@^0.27.0",
+    "github": "npm:jspm-github@^0.14.11",
     "jquery": "components/jquery@2.1.4",
     "jspm": "jspm/jspm-cli@0.17",
     "mocha": "npm:mocha@1.21.5",
@@ -51,7 +51,7 @@
     "querystring": "npm:jspm-nodelibs-querystring@^0.2.0",
     "readline": "npm:jspm-nodelibs-readline@^0.2.0",
     "repl": "npm:jspm-nodelibs-repl@^0.2.0",
-    "source-map": "npm:source-map",
+    "source-map": "npm:source-map@^0.5.6",
     "stream": "npm:jspm-nodelibs-stream@^0.2.0",
     "string_decoder": "npm:jspm-nodelibs-string_decoder@^0.2.0",
     "timers": "npm:jspm-nodelibs-timers@^0.2.0",
@@ -64,7 +64,7 @@
     "zlib": "npm:jspm-nodelibs-zlib@^0.2.0"
   },
   "overrides": {
-    "github:angular/bower-angular@1.4.8": {
+    "github:angular/bower-angular@1.6.1": {
       "main": "angular",
       "meta": {
         "angular.js": {
@@ -82,6 +82,38 @@
     "github:components/jquery@2.1.4": {
       "main": "jquery"
     },
+    "github:twbs/bootstrap@3.3.7": {
+      "shim": {
+        "js/bootstrap": {
+          "deps": [
+            "jquery"
+          ],
+          "exports": "$"
+        }
+      },
+      "dependencies": {
+        "jquery": "github:components/jquery"
+      },
+      "files": [
+        "dist",
+        "fonts",
+        "js",
+        "less",
+        "grunt",
+        "LICENSE"
+      ],
+      "systemjs": {
+        "main": "dist/js/bootstrap.js",
+        "meta": {
+          "dist/js/bootstrap.js": {
+            "deps": [
+              "jquery"
+            ],
+            "exports": "$"
+          }
+        }
+      }
+    },
     "npm:babel-runtime@5.8.38": {
       "main": false,
       "dependencies": {},
@@ -99,6 +131,16 @@
         }
       }
     },
+    "npm:bluebird@3.4.7": {
+      "meta": {
+        "js/browser/bluebird.js": {
+          "format": "global"
+        },
+        "js/browser/bluebird.min.js": {
+          "format": "global"
+        }
+      }
+    },
     "npm:debug@2.2.0": {
       "main": "browser.js",
       "jspmNodeConversion": false,
@@ -116,12 +158,71 @@
         "util": "@node/util"
       }
     },
+    "npm:debug@2.6.0": {
+      "main": "browser.js",
+      "jspmNodeConversion": false,
+      "format": "cjs",
+      "map": {
+        "./browser.js": {
+          "node": "./node.js"
+        },
+        "./node.js": {
+          "browser": "./browser.js"
+        },
+        "fs": "@node/fs",
+        "net": "@node/net",
+        "tty": "@node/tty",
+        "util": "@node/util"
+      }
+    },
+    "npm:graceful-fs@3.0.11": {
+      "format": "cjs",
+      "meta": {
+        "*": {
+          "globals": {
+            "process": "process"
+          }
+        },
+        "*.json": {
+          "format": "json"
+        }
+      },
+      "map": {
+        "./fs.js": "@node/fs"
+      }
+    },
+    "npm:inherits@2.0.3": {
+      "ignore": [
+        "test.js"
+      ],
+      "systemjs": {
+        "main": "inherits.js",
+        "format": "cjs",
+        "meta": {
+          "*.json": {
+            "format": "json"
+          }
+        },
+        "map": {
+          "util": "@node/util",
+          "./inherits.js": {
+            "browser": "./inherits_browser.js"
+          }
+        }
+      }
+    },
     "npm:lodash@4.13.1": {
       "map": {
         "buffer": "@empty",
         "process": "@empty"
       }
     },
+    "npm:lodash@4.17.4": {
+      "map": {
+        "buffer": "@empty",
+        "process": "@empty"
+      }
+    },
     "npm:mocha@1.21.5": {
       "browser": "mocha",
       "main": "mocha",
@@ -142,6 +243,10 @@
       "jspmNodeConversion": false,
       "format": "cjs"
     },
+    "npm:ms@0.7.2": {
+      "jspmNodeConversion": false,
+      "format": "cjs"
+    },
     "npm:readable-stream@1.0.33": {
       "map": {
         "stream": "stream-browserify/index"
@@ -182,38 +287,6 @@
         }
       }
     },
-    "github:twbs/bootstrap@3.3.6": {
-      "shim": {
-        "js/bootstrap": {
-          "deps": [
-            "jquery"
-          ],
-          "exports": "$"
-        }
-      },
-      "dependencies": {
-        "jquery": "github:components/jquery"
-      },
-      "files": [
-        "dist",
-        "fonts",
-        "js",
-        "less",
-        "grunt",
-        "LICENSE"
-      ],
-      "systemjs": {
-        "main": "dist/js/bootstrap.js",
-        "meta": {
-          "dist/js/bootstrap.js": {
-            "deps": [
-              "jquery"
-            ],
-            "exports": "$"
-          }
-        }
-      }
-    },
     "npm:browserify-zlib@0.1.4": {
       "dependencies": {
         "readable-stream": "^1.0.27-1",
@@ -259,6 +332,33 @@
         }
       }
     },
+    "npm:systemjs-builder@0.15.35": {
+      "meta": {
+        "*": {
+          "globals": {
+            "process": "process"
+          }
+        },
+        "*.json": {
+          "format": "json"
+        },
+        "lib/output.js": {
+          "globals": {
+            "Buffer": "buffer"
+          }
+        },
+        "lib/compile.js": {
+          "deps": [
+            "../compilers/amd",
+            "../compilers/cjs",
+            "../compilers/esm",
+            "../compilers/global",
+            "../compilers/register",
+            "../compilers/json"
+          ]
+        }
+      }
+    },
     "npm:systemjs@0.19.29": {
       "main": "index.js",
       "format": "cjs",
@@ -285,6 +385,32 @@
         "package.json": true
       }
     },
+    "npm:systemjs@0.19.43": {
+      "main": "index.js",
+      "format": "cjs",
+      "meta": {
+        "*": {
+          "globals": {
+            "process": "process"
+          }
+        },
+        "*.json": {
+          "format": "json"
+        },
+        "dist/system.src.js": {
+          "deps": [
+            "vm"
+          ]
+        },
+        "docs/module-formats.md": {
+          "format": "amd"
+        },
+        "lib/amd.js": {
+          "format": "amd"
+        },
+        "package.json": true
+      }
+    },
     "npm:traceur@0.0.105": {
       "main": "src/node/api.js",
       "format": "cjs",
@@ -321,4 +447,4 @@
       "map": {}
     }
   }
-}
\ No newline at end of file
+}