diff --git a/CHANGELOG.MD b/CHANGELOG.MD
index 66c5bf6..846fd6c 100644
--- a/CHANGELOG.MD
+++ b/CHANGELOG.MD
@@ -1,3 +1,6 @@
+* 0.4.1
+  * now supports Angular 2 beta 6
+  * removed tsd dependency
 * 0.4.0
   * now uses modernWebDevBuild 0.4.x: https://github.com/dsebastien/modernWebDevBuild/releases/tag/0.4.0
   * upgraded the version of the typings dependency (closes #84)
diff --git a/app/templates/applicationFiles/app/typings/README.md b/app/templates/applicationFiles/app/typings/README.md
new file mode 100644
index 0000000..6113f5e
--- /dev/null
+++ b/app/templates/applicationFiles/app/typings/README.md
@@ -0,0 +1,13 @@
+This folder should only contain custom TypeScript type definitions (.d.ts) files.
+
+Only place your own type definitions here or ones that you must temporarily copy/modify.
+Unless you have no choice, you should install type definitions using `typings install ... --save`.
+ 
+If you install typings using the command above:
+* typings.json will be updated
+* the typings will be downloaded in the root typings folder (i.e., not this one)
+* references to these typings files will be added to both `main.d.ts` and `browser.d.ts` in the root typings folder
+
+All type definition files in this folder will automatically be picked up by the TypeScript compiler.
+
+For more details about the typings CLI, check out the official docs: https://github.com/typings/typings
diff --git a/app/templates/applicationFiles/app/typings/custom.d.ts b/app/templates/applicationFiles/app/typings/custom.d.ts
new file mode 100644
index 0000000..7b8619a
--- /dev/null
+++ b/app/templates/applicationFiles/app/typings/custom.d.ts
@@ -0,0 +1,30 @@
+/*
+ * Custom Type Definitions
+ * When including 3rd party modules you also need to include the type definition for the module
+ * if they don't provide one within the module. You can try to install it with typings
+
+ typings install node --save
+
+ * If you can't find the type definition in the registry we can make an ambient definition in
+ * this file for now. For example
+
+ declare module "my-module" {
+ export function doesSomething(value: string): string;
+ }
+
+ *
+ * If you're prototying and you will fix the types later you can also declare it as type any
+ *
+
+ declare var assert: any;
+
+ *
+ * If you're importing a module that uses Node.js modules which are CommonJS you need to import as
+ *
+
+ import * as _ from 'lodash'
+
+ * You can include your type definitions in this file until you create one for the typings registry
+ * see https://github.com/typings/registry
+ *
+ */
diff --git a/app/templates/applicationFiles/app/typings/custom/.gitkeep b/app/templates/applicationFiles/app/typings/custom/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/app/templates/projectFiles/jspm.conf.js b/app/templates/projectFiles/jspm.conf.js
index 652ef15..feaad6f 100644
--- a/app/templates/projectFiles/jspm.conf.js
+++ b/app/templates/projectFiles/jspm.conf.js
@@ -2,623 +2,627 @@ System.config({
   defaultJSExtensions: true,
   transpiler: false,
   paths: {
-	"github:*": "jspm_packages/github/*",
-	"npm:*": "jspm_packages/npm/*"
+    "github:*": "jspm_packages/github/*",
+    "npm:*": "jspm_packages/npm/*"
   },
 
   map: {
-	"angular2": "npm:angular2@2.0.0-beta.3",
-	"babel": "npm:babel-core@6.5.0",
-	"babel-runtime": "npm:babel-runtime@6.5.0",
-	"normalize.css": "github:necolas/normalize.css@3.0.3",
-	"rxjs": "npm:rxjs@5.0.0-beta.0",
-	"github:jspm/nodelibs-assert@0.1.0": {
-	  "assert": "npm:assert@1.3.0"
-	},
-	"github:jspm/nodelibs-buffer@0.1.0": {
-	  "buffer": "npm:buffer@3.6.0"
-	},
-	"github:jspm/nodelibs-constants@0.1.0": {
-	  "constants-browserify": "npm:constants-browserify@0.0.1"
-	},
-	"github:jspm/nodelibs-crypto@0.1.0": {
-	  "crypto-browserify": "npm:crypto-browserify@3.11.0"
-	},
-	"github:jspm/nodelibs-events@0.1.1": {
-	  "events": "npm:events@1.0.2"
-	},
-	"github:jspm/nodelibs-http@1.7.1": {
-	  "Base64": "npm:Base64@0.2.1",
-	  "events": "github:jspm/nodelibs-events@0.1.1",
-	  "inherits": "npm:inherits@2.0.1",
-	  "stream": "github:jspm/nodelibs-stream@0.1.0",
-	  "url": "github:jspm/nodelibs-url@0.1.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"github:jspm/nodelibs-net@0.1.2": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "http": "github:jspm/nodelibs-http@1.7.1",
-	  "net": "github:jspm/nodelibs-net@0.1.2",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "stream": "github:jspm/nodelibs-stream@0.1.0",
-	  "timers": "github:jspm/nodelibs-timers@0.1.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"github:jspm/nodelibs-path@0.1.0": {
-	  "path-browserify": "npm:path-browserify@0.0.0"
-	},
-	"github:jspm/nodelibs-process@0.1.2": {
-	  "process": "npm:process@0.11.2"
-	},
-	"github:jspm/nodelibs-querystring@0.1.0": {
-	  "querystring": "npm:querystring@0.2.0"
-	},
-	"github:jspm/nodelibs-stream@0.1.0": {
-	  "stream-browserify": "npm:stream-browserify@1.0.0"
-	},
-	"github:jspm/nodelibs-string_decoder@0.1.0": {
-	  "string_decoder": "npm:string_decoder@0.10.31"
-	},
-	"github:jspm/nodelibs-timers@0.1.0": {
-	  "timers-browserify": "npm:timers-browserify@1.4.2"
-	},
-	"github:jspm/nodelibs-tty@0.1.0": {
-	  "tty-browserify": "npm:tty-browserify@0.0.0"
-	},
-	"github:jspm/nodelibs-url@0.1.0": {
-	  "url": "npm:url@0.10.3"
-	},
-	"github:jspm/nodelibs-util@0.1.0": {
-	  "util": "npm:util@0.10.3"
-	},
-	"github:jspm/nodelibs-vm@0.1.0": {
-	  "vm-browserify": "npm:vm-browserify@0.0.4"
-	},
-	"github:necolas/normalize.css@3.0.3": {
-	  "css": "github:systemjs/plugin-css@0.1.20"
-	},
-	"npm:amdefine@1.0.0": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "module": "github:jspm/nodelibs-module@0.1.0",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:angular2@2.0.0-beta.3": {
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "es6-promise": "npm:es6-promise@3.0.2",
-	  "es6-shim": "npm:es6-shim@0.33.13",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "reflect-metadata": "npm:reflect-metadata@0.1.2",
-	  "rxjs": "npm:rxjs@5.0.0-beta.0",
-	  "zone.js": "npm:zone.js@0.5.11"
-	},
-	"npm:asn1.js@4.4.0": {
-	  "assert": "github:jspm/nodelibs-assert@0.1.0",
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "inherits": "npm:inherits@2.0.1",
-	  "minimalistic-assert": "npm:minimalistic-assert@1.0.0",
-	  "vm": "github:jspm/nodelibs-vm@0.1.0"
-	},
-	"npm:assert@1.3.0": {
-	  "util": "npm:util@0.10.3"
-	},
-	"npm:babel-code-frame@6.5.0": {
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "chalk": "npm:chalk@1.1.1",
-	  "esutils": "npm:esutils@2.0.2",
-	  "js-tokens": "npm:js-tokens@1.0.2",
-	  "line-numbers": "npm:line-numbers@0.2.0",
-	  "repeating": "npm:repeating@1.1.3"
-	},
-	"npm:babel-core@6.5.0": {
-	  "babel-code-frame": "npm:babel-code-frame@6.5.0",
-	  "babel-generator": "npm:babel-generator@6.5.0",
-	  "babel-helpers": "npm:babel-helpers@6.5.0",
-	  "babel-messages": "npm:babel-messages@6.5.0",
-	  "babel-register": "npm:babel-register@6.5.1",
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-template": "npm:babel-template@6.5.0",
-	  "babel-traverse": "npm:babel-traverse@6.5.0",
-	  "babel-types": "npm:babel-types@6.5.1",
-	  "babylon": "npm:babylon@6.5.0",
-	  "convert-source-map": "npm:convert-source-map@1.1.3",
-	  "debug": "npm:debug@2.2.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "json5": "npm:json5@0.4.0",
-	  "lodash": "npm:lodash@3.10.1",
-	  "minimatch": "npm:minimatch@2.0.10",
-	  "module": "github:jspm/nodelibs-module@0.1.0",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "path-exists": "npm:path-exists@1.0.0",
-	  "path-is-absolute": "npm:path-is-absolute@1.0.0",
-	  "private": "npm:private@0.1.6",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "shebang-regex": "npm:shebang-regex@1.0.0",
-	  "slash": "npm:slash@1.0.0",
-	  "source-map": "npm:source-map@0.5.3",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:babel-core@6.5.1": {
-	  "babel-code-frame": "npm:babel-code-frame@6.5.0",
-	  "babel-generator": "npm:babel-generator@6.5.0",
-	  "babel-helpers": "npm:babel-helpers@6.5.0",
-	  "babel-messages": "npm:babel-messages@6.5.0",
-	  "babel-register": "npm:babel-register@6.5.1",
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-template": "npm:babel-template@6.5.0",
-	  "babel-traverse": "npm:babel-traverse@6.5.0",
-	  "babel-types": "npm:babel-types@6.5.1",
-	  "babylon": "npm:babylon@6.5.0",
-	  "convert-source-map": "npm:convert-source-map@1.1.3",
-	  "debug": "npm:debug@2.2.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "json5": "npm:json5@0.4.0",
-	  "lodash": "npm:lodash@3.10.1",
-	  "minimatch": "npm:minimatch@2.0.10",
-	  "module": "github:jspm/nodelibs-module@0.1.0",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "path-exists": "npm:path-exists@1.0.0",
-	  "path-is-absolute": "npm:path-is-absolute@1.0.0",
-	  "private": "npm:private@0.1.6",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "shebang-regex": "npm:shebang-regex@1.0.0",
-	  "slash": "npm:slash@1.0.0",
-	  "source-map": "npm:source-map@0.5.3",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:babel-generator@6.5.0": {
-	  "babel-messages": "npm:babel-messages@6.5.0",
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-types": "npm:babel-types@6.5.1",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "detect-indent": "npm:detect-indent@3.0.1",
-	  "is-integer": "npm:is-integer@1.0.6",
-	  "lodash": "npm:lodash@3.10.1",
-	  "repeating": "npm:repeating@1.1.3",
-	  "source-map": "npm:source-map@0.5.3",
-	  "trim-right": "npm:trim-right@1.0.1"
-	},
-	"npm:babel-helpers@6.5.0": {
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-template": "npm:babel-template@6.5.0"
-	},
-	"npm:babel-messages@6.5.0": {
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:babel-register@6.5.1": {
-	  "babel-core": "npm:babel-core@6.5.1",
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "core-js": "npm:core-js@1.2.6",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "home-or-tmp": "npm:home-or-tmp@1.0.0",
-	  "lodash": "npm:lodash@3.10.1",
-	  "mkdirp": "npm:mkdirp@0.5.1",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "path-exists": "npm:path-exists@1.0.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "source-map-support": "npm:source-map-support@0.2.10"
-	},
-	"npm:babel-runtime@5.8.35": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:babel-runtime@6.5.0": {
-	  "core-js": "npm:core-js@1.2.6",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:babel-template@6.5.0": {
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-traverse": "npm:babel-traverse@6.5.0",
-	  "babel-types": "npm:babel-types@6.5.1",
-	  "babylon": "npm:babylon@6.5.0",
-	  "lodash": "npm:lodash@3.10.1"
-	},
-	"npm:babel-traverse@6.5.0": {
-	  "babel-code-frame": "npm:babel-code-frame@6.5.0",
-	  "babel-messages": "npm:babel-messages@6.5.0",
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-types": "npm:babel-types@6.5.1",
-	  "babylon": "npm:babylon@6.5.0",
-	  "debug": "npm:debug@2.2.0",
-	  "globals": "npm:globals@8.18.0",
-	  "invariant": "npm:invariant@2.2.0",
-	  "lodash": "npm:lodash@3.10.1",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "repeating": "npm:repeating@1.1.3"
-	},
-	"npm:babel-types@6.5.1": {
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "babel-traverse": "npm:babel-traverse@6.5.0",
-	  "esutils": "npm:esutils@2.0.2",
-	  "lodash": "npm:lodash@3.10.1",
-	  "to-fast-properties": "npm:to-fast-properties@1.0.1"
-	},
-	"npm:babylon@6.5.0": {
-	  "babel-runtime": "npm:babel-runtime@5.8.35",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:bn.js@4.10.3": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-	},
-	"npm:brace-expansion@1.1.2": {
-	  "balanced-match": "npm:balanced-match@0.3.0",
-	  "concat-map": "npm:concat-map@0.0.1"
-	},
-	"npm:browserify-aes@1.0.6": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "buffer-xor": "npm:buffer-xor@1.0.3",
-	  "cipher-base": "npm:cipher-base@1.0.2",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "evp_bytestokey": "npm:evp_bytestokey@1.0.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "inherits": "npm:inherits@2.0.1",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:browserify-cipher@1.0.0": {
-	  "browserify-aes": "npm:browserify-aes@1.0.6",
-	  "browserify-des": "npm:browserify-des@1.0.0",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "evp_bytestokey": "npm:evp_bytestokey@1.0.0"
-	},
-	"npm:browserify-des@1.0.0": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "cipher-base": "npm:cipher-base@1.0.2",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "des.js": "npm:des.js@1.0.0",
-	  "inherits": "npm:inherits@2.0.1"
-	},
-	"npm:browserify-rsa@4.0.0": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "constants": "github:jspm/nodelibs-constants@0.1.0",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "randombytes": "npm:randombytes@2.0.2"
-	},
-	"npm:browserify-sign@4.0.0": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "browserify-rsa": "npm:browserify-rsa@4.0.0",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "create-hmac": "npm:create-hmac@1.1.4",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "elliptic": "npm:elliptic@6.2.3",
-	  "inherits": "npm:inherits@2.0.1",
-	  "parse-asn1": "npm:parse-asn1@5.0.0",
-	  "stream": "github:jspm/nodelibs-stream@0.1.0"
-	},
-	"npm:buffer-xor@1.0.3": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:buffer@3.6.0": {
-	  "base64-js": "npm:base64-js@0.0.8",
-	  "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "ieee754": "npm:ieee754@1.1.6",
-	  "isarray": "npm:isarray@1.0.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:chalk@1.1.1": {
-	  "ansi-styles": "npm:ansi-styles@2.1.0",
-	  "escape-string-regexp": "npm:escape-string-regexp@1.0.4",
-	  "has-ansi": "npm:has-ansi@2.0.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "strip-ansi": "npm:strip-ansi@3.0.0",
-	  "supports-color": "npm:supports-color@2.0.0"
-	},
-	"npm:cipher-base@1.0.2": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "inherits": "npm:inherits@2.0.1",
-	  "stream": "github:jspm/nodelibs-stream@0.1.0",
-	  "string_decoder": "github:jspm/nodelibs-string_decoder@0.1.0"
-	},
-	"npm:constants-browserify@0.0.1": {
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:convert-source-map@1.1.3": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "path": "github:jspm/nodelibs-path@0.1.0"
-	},
-	"npm:core-js@1.2.6": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:core-util-is@1.0.2": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-	},
-	"npm:create-ecdh@4.0.0": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "elliptic": "npm:elliptic@6.2.3"
-	},
-	"npm:create-hash@1.1.2": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "cipher-base": "npm:cipher-base@1.0.2",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "inherits": "npm:inherits@2.0.1",
-	  "ripemd160": "npm:ripemd160@1.0.1",
-	  "sha.js": "npm:sha.js@2.4.4"
-	},
-	"npm:create-hmac@1.1.4": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "inherits": "npm:inherits@2.0.1",
-	  "stream": "github:jspm/nodelibs-stream@0.1.0"
-	},
-	"npm:crypto-browserify@3.11.0": {
-	  "browserify-cipher": "npm:browserify-cipher@1.0.0",
-	  "browserify-sign": "npm:browserify-sign@4.0.0",
-	  "create-ecdh": "npm:create-ecdh@4.0.0",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "create-hmac": "npm:create-hmac@1.1.4",
-	  "diffie-hellman": "npm:diffie-hellman@5.0.2",
-	  "inherits": "npm:inherits@2.0.1",
-	  "pbkdf2": "npm:pbkdf2@3.0.4",
-	  "public-encrypt": "npm:public-encrypt@4.0.0",
-	  "randombytes": "npm:randombytes@2.0.2"
-	},
-	"npm:debug@2.2.0": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "ms": "npm:ms@0.7.1",
-	  "net": "github:jspm/nodelibs-net@0.1.2",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "tty": "github:jspm/nodelibs-tty@0.1.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:des.js@1.0.0": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "inherits": "npm:inherits@2.0.1",
-	  "minimalistic-assert": "npm:minimalistic-assert@1.0.0"
-	},
-	"npm:detect-indent@3.0.1": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "get-stdin": "npm:get-stdin@4.0.1",
-	  "minimist": "npm:minimist@1.2.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "repeating": "npm:repeating@1.1.3",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:diffie-hellman@5.0.2": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "miller-rabin": "npm:miller-rabin@4.0.0",
-	  "randombytes": "npm:randombytes@2.0.2",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:elliptic@6.2.3": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "brorand": "npm:brorand@1.0.5",
-	  "hash.js": "npm:hash.js@1.0.3",
-	  "inherits": "npm:inherits@2.0.1",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:es6-promise@3.0.2": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:es6-shim@0.33.13": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:evp_bytestokey@1.0.0": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0"
-	},
-	"npm:get-stdin@4.0.1": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:globals@8.18.0": {
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:has-ansi@2.0.0": {
-	  "ansi-regex": "npm:ansi-regex@2.0.0"
-	},
-	"npm:hash.js@1.0.3": {
-	  "inherits": "npm:inherits@2.0.1"
-	},
-	"npm:home-or-tmp@1.0.0": {
-	  "os-tmpdir": "npm:os-tmpdir@1.0.1",
-	  "user-home": "npm:user-home@1.1.1"
-	},
-	"npm:inherits@2.0.1": {
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:invariant@2.2.0": {
-	  "loose-envify": "npm:loose-envify@1.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:is-finite@1.0.1": {
-	  "number-is-nan": "npm:number-is-nan@1.0.0"
-	},
-	"npm:is-integer@1.0.6": {
-	  "is-finite": "npm:is-finite@1.0.1"
-	},
-	"npm:json5@0.4.0": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:line-numbers@0.2.0": {
-	  "left-pad": "npm:left-pad@0.0.3"
-	},
-	"npm:lodash@3.10.1": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:loose-envify@1.1.0": {
-	  "js-tokens": "npm:js-tokens@1.0.2",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "stream": "github:jspm/nodelibs-stream@0.1.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:miller-rabin@4.0.0": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "brorand": "npm:brorand@1.0.5"
-	},
-	"npm:minimatch@2.0.10": {
-	  "brace-expansion": "npm:brace-expansion@1.1.2",
-	  "path": "github:jspm/nodelibs-path@0.1.0"
-	},
-	"npm:mkdirp@0.5.1": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "minimist": "npm:minimist@0.0.8",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:os-tmpdir@1.0.1": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:parse-asn1@5.0.0": {
-	  "asn1.js": "npm:asn1.js@4.4.0",
-	  "browserify-aes": "npm:browserify-aes@1.0.6",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "evp_bytestokey": "npm:evp_bytestokey@1.0.0",
-	  "pbkdf2": "npm:pbkdf2@3.0.4",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:path-browserify@0.0.0": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:path-exists@1.0.0": {
-	  "fs": "github:jspm/nodelibs-fs@0.1.2"
-	},
-	"npm:path-is-absolute@1.0.0": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:pbkdf2@3.0.4": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-	  "create-hmac": "npm:create-hmac@1.1.4",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:process@0.11.2": {
-	  "assert": "github:jspm/nodelibs-assert@0.1.0"
-	},
-	"npm:public-encrypt@4.0.0": {
-	  "bn.js": "npm:bn.js@4.10.3",
-	  "browserify-rsa": "npm:browserify-rsa@4.0.0",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "create-hash": "npm:create-hash@1.1.2",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "parse-asn1": "npm:parse-asn1@5.0.0",
-	  "randombytes": "npm:randombytes@2.0.2"
-	},
-	"npm:punycode@1.3.2": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:randombytes@2.0.2": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "crypto": "github:jspm/nodelibs-crypto@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:readable-stream@1.1.13": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "core-util-is": "npm:core-util-is@1.0.2",
-	  "events": "github:jspm/nodelibs-events@0.1.1",
-	  "inherits": "npm:inherits@2.0.1",
-	  "isarray": "npm:isarray@0.0.1",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "stream-browserify": "npm:stream-browserify@1.0.0",
-	  "string_decoder": "npm:string_decoder@0.10.31"
-	},
-	"npm:reflect-metadata@0.1.2": {
-	  "assert": "github:jspm/nodelibs-assert@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:repeating@1.1.3": {
-	  "is-finite": "npm:is-finite@1.0.1",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:ripemd160@1.0.1": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:rxjs@5.0.0-beta.0": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:sha.js@2.4.4": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "inherits": "npm:inherits@2.0.1",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:source-map-support@0.2.10": {
-	  "assert": "github:jspm/nodelibs-assert@0.1.0",
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0",
-	  "child_process": "github:jspm/nodelibs-child_process@0.1.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "http": "github:jspm/nodelibs-http@1.7.1",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "querystring": "github:jspm/nodelibs-querystring@0.1.0",
-	  "source-map": "npm:source-map@0.1.32"
-	},
-	"npm:source-map@0.1.32": {
-	  "amdefine": "npm:amdefine@1.0.0",
-	  "fs": "github:jspm/nodelibs-fs@0.1.2",
-	  "path": "github:jspm/nodelibs-path@0.1.0",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:source-map@0.5.3": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:stream-browserify@1.0.0": {
-	  "events": "github:jspm/nodelibs-events@0.1.1",
-	  "inherits": "npm:inherits@2.0.1",
-	  "readable-stream": "npm:readable-stream@1.1.13"
-	},
-	"npm:string_decoder@0.10.31": {
-	  "buffer": "github:jspm/nodelibs-buffer@0.1.0"
-	},
-	"npm:strip-ansi@3.0.0": {
-	  "ansi-regex": "npm:ansi-regex@2.0.0"
-	},
-	"npm:supports-color@2.0.0": {
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:timers-browserify@1.4.2": {
-	  "process": "npm:process@0.11.2"
-	},
-	"npm:url@0.10.3": {
-	  "assert": "github:jspm/nodelibs-assert@0.1.0",
-	  "punycode": "npm:punycode@1.3.2",
-	  "querystring": "npm:querystring@0.2.0",
-	  "util": "github:jspm/nodelibs-util@0.1.0"
-	},
-	"npm:user-home@1.1.1": {
-	  "process": "github:jspm/nodelibs-process@0.1.2",
-	  "systemjs-json": "github:systemjs/plugin-json@0.1.0"
-	},
-	"npm:util@0.10.3": {
-	  "inherits": "npm:inherits@2.0.1",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	},
-	"npm:vm-browserify@0.0.4": {
-	  "indexof": "npm:indexof@0.0.1"
-	},
-	"npm:zone.js@0.5.11": {
-	  "es6-promise": "npm:es6-promise@3.0.2",
-	  "process": "github:jspm/nodelibs-process@0.1.2"
-	}
+    "angular2": "npm:angular2@2.0.0-beta.6",
+    "babel": "npm:babel-core@6.5.0",
+    "babel-runtime": "npm:babel-runtime@6.5.0",
+    "normalize.css": "github:necolas/normalize.css@3.0.3",
+    "rxjs": "npm:rxjs@5.0.0-beta.2",
+    "github:jspm/nodelibs-assert@0.1.0": {
+      "assert": "npm:assert@1.3.0"
+    },
+    "github:jspm/nodelibs-buffer@0.1.0": {
+      "buffer": "npm:buffer@3.6.0"
+    },
+    "github:jspm/nodelibs-constants@0.1.0": {
+      "constants-browserify": "npm:constants-browserify@0.0.1"
+    },
+    "github:jspm/nodelibs-crypto@0.1.0": {
+      "crypto-browserify": "npm:crypto-browserify@3.11.0"
+    },
+    "github:jspm/nodelibs-events@0.1.1": {
+      "events": "npm:events@1.0.2"
+    },
+    "github:jspm/nodelibs-http@1.7.1": {
+      "Base64": "npm:Base64@0.2.1",
+      "events": "github:jspm/nodelibs-events@0.1.1",
+      "inherits": "npm:inherits@2.0.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "url": "github:jspm/nodelibs-url@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "github:jspm/nodelibs-net@0.1.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "http": "github:jspm/nodelibs-http@1.7.1",
+      "net": "github:jspm/nodelibs-net@0.1.2",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "timers": "github:jspm/nodelibs-timers@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "github:jspm/nodelibs-path@0.1.0": {
+      "path-browserify": "npm:path-browserify@0.0.0"
+    },
+    "github:jspm/nodelibs-process@0.1.2": {
+      "process": "npm:process@0.11.2"
+    },
+    "github:jspm/nodelibs-querystring@0.1.0": {
+      "querystring": "npm:querystring@0.2.0"
+    },
+    "github:jspm/nodelibs-stream@0.1.0": {
+      "stream-browserify": "npm:stream-browserify@1.0.0"
+    },
+    "github:jspm/nodelibs-string_decoder@0.1.0": {
+      "string_decoder": "npm:string_decoder@0.10.31"
+    },
+    "github:jspm/nodelibs-timers@0.1.0": {
+      "timers-browserify": "npm:timers-browserify@1.4.2"
+    },
+    "github:jspm/nodelibs-tty@0.1.0": {
+      "tty-browserify": "npm:tty-browserify@0.0.0"
+    },
+    "github:jspm/nodelibs-url@0.1.0": {
+      "url": "npm:url@0.10.3"
+    },
+    "github:jspm/nodelibs-util@0.1.0": {
+      "util": "npm:util@0.10.3"
+    },
+    "github:jspm/nodelibs-vm@0.1.0": {
+      "vm-browserify": "npm:vm-browserify@0.0.4"
+    },
+    "github:necolas/normalize.css@3.0.3": {
+      "css": "github:systemjs/plugin-css@0.1.20"
+    },
+    "npm:amdefine@1.0.0": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "module": "github:jspm/nodelibs-module@0.1.0",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:angular2@2.0.0-beta.6": {
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "es6-promise": "npm:es6-promise@3.0.2",
+      "es6-shim": "npm:es6-shim@0.33.13",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "reflect-metadata": "npm:reflect-metadata@0.1.2",
+      "rxjs": "npm:rxjs@5.0.0-beta.0",
+      "zone.js": "npm:zone.js@0.5.14"
+    },
+    "npm:asn1.js@4.4.0": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "bn.js": "npm:bn.js@4.10.3",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "minimalistic-assert": "npm:minimalistic-assert@1.0.0",
+      "vm": "github:jspm/nodelibs-vm@0.1.0"
+    },
+    "npm:assert@1.3.0": {
+      "util": "npm:util@0.10.3"
+    },
+    "npm:babel-code-frame@6.5.0": {
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "chalk": "npm:chalk@1.1.1",
+      "esutils": "npm:esutils@2.0.2",
+      "js-tokens": "npm:js-tokens@1.0.2",
+      "line-numbers": "npm:line-numbers@0.2.0",
+      "repeating": "npm:repeating@1.1.3"
+    },
+    "npm:babel-core@6.5.0": {
+      "babel-code-frame": "npm:babel-code-frame@6.5.0",
+      "babel-generator": "npm:babel-generator@6.5.0",
+      "babel-helpers": "npm:babel-helpers@6.5.0",
+      "babel-messages": "npm:babel-messages@6.5.0",
+      "babel-register": "npm:babel-register@6.5.2",
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-template": "npm:babel-template@6.5.0",
+      "babel-traverse": "npm:babel-traverse@6.5.0",
+      "babel-types": "npm:babel-types@6.5.2",
+      "babylon": "npm:babylon@6.5.2",
+      "convert-source-map": "npm:convert-source-map@1.1.3",
+      "debug": "npm:debug@2.2.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "json5": "npm:json5@0.4.0",
+      "lodash": "npm:lodash@3.10.1",
+      "minimatch": "npm:minimatch@2.0.10",
+      "module": "github:jspm/nodelibs-module@0.1.0",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "path-exists": "npm:path-exists@1.0.0",
+      "path-is-absolute": "npm:path-is-absolute@1.0.0",
+      "private": "npm:private@0.1.6",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "shebang-regex": "npm:shebang-regex@1.0.0",
+      "slash": "npm:slash@1.0.0",
+      "source-map": "npm:source-map@0.5.3",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:babel-core@6.5.2": {
+      "babel-code-frame": "npm:babel-code-frame@6.5.0",
+      "babel-generator": "npm:babel-generator@6.5.0",
+      "babel-helpers": "npm:babel-helpers@6.5.0",
+      "babel-messages": "npm:babel-messages@6.5.0",
+      "babel-register": "npm:babel-register@6.5.2",
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-template": "npm:babel-template@6.5.0",
+      "babel-traverse": "npm:babel-traverse@6.5.0",
+      "babel-types": "npm:babel-types@6.5.2",
+      "babylon": "npm:babylon@6.5.2",
+      "convert-source-map": "npm:convert-source-map@1.1.3",
+      "debug": "npm:debug@2.2.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "json5": "npm:json5@0.4.0",
+      "lodash": "npm:lodash@3.10.1",
+      "minimatch": "npm:minimatch@2.0.10",
+      "module": "github:jspm/nodelibs-module@0.1.0",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "path-exists": "npm:path-exists@1.0.0",
+      "path-is-absolute": "npm:path-is-absolute@1.0.0",
+      "private": "npm:private@0.1.6",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "shebang-regex": "npm:shebang-regex@1.0.0",
+      "slash": "npm:slash@1.0.0",
+      "source-map": "npm:source-map@0.5.3",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:babel-generator@6.5.0": {
+      "babel-messages": "npm:babel-messages@6.5.0",
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-types": "npm:babel-types@6.5.2",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "detect-indent": "npm:detect-indent@3.0.1",
+      "is-integer": "npm:is-integer@1.0.6",
+      "lodash": "npm:lodash@3.10.1",
+      "repeating": "npm:repeating@1.1.3",
+      "source-map": "npm:source-map@0.5.3",
+      "trim-right": "npm:trim-right@1.0.1"
+    },
+    "npm:babel-helpers@6.5.0": {
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-template": "npm:babel-template@6.5.0"
+    },
+    "npm:babel-messages@6.5.0": {
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:babel-register@6.5.2": {
+      "babel-core": "npm:babel-core@6.5.2",
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "core-js": "npm:core-js@1.2.6",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "home-or-tmp": "npm:home-or-tmp@1.0.0",
+      "lodash": "npm:lodash@3.10.1",
+      "mkdirp": "npm:mkdirp@0.5.1",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "path-exists": "npm:path-exists@1.0.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "source-map-support": "npm:source-map-support@0.2.10"
+    },
+    "npm:babel-runtime@5.8.35": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:babel-runtime@6.5.0": {
+      "core-js": "npm:core-js@1.2.6",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:babel-template@6.5.0": {
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-traverse": "npm:babel-traverse@6.5.0",
+      "babel-types": "npm:babel-types@6.5.2",
+      "babylon": "npm:babylon@6.5.2",
+      "lodash": "npm:lodash@3.10.1"
+    },
+    "npm:babel-traverse@6.5.0": {
+      "babel-code-frame": "npm:babel-code-frame@6.5.0",
+      "babel-messages": "npm:babel-messages@6.5.0",
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-types": "npm:babel-types@6.5.2",
+      "babylon": "npm:babylon@6.5.2",
+      "debug": "npm:debug@2.2.0",
+      "globals": "npm:globals@8.18.0",
+      "invariant": "npm:invariant@2.2.0",
+      "lodash": "npm:lodash@3.10.1",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "repeating": "npm:repeating@1.1.3"
+    },
+    "npm:babel-types@6.5.2": {
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "babel-traverse": "npm:babel-traverse@6.5.0",
+      "esutils": "npm:esutils@2.0.2",
+      "lodash": "npm:lodash@3.10.1",
+      "to-fast-properties": "npm:to-fast-properties@1.0.1"
+    },
+    "npm:babylon@6.5.2": {
+      "babel-runtime": "npm:babel-runtime@5.8.35",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:bn.js@4.10.3": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
+    },
+    "npm:brace-expansion@1.1.3": {
+      "balanced-match": "npm:balanced-match@0.3.0",
+      "concat-map": "npm:concat-map@0.0.1"
+    },
+    "npm:browserify-aes@1.0.6": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "buffer-xor": "npm:buffer-xor@1.0.3",
+      "cipher-base": "npm:cipher-base@1.0.2",
+      "create-hash": "npm:create-hash@1.1.2",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "evp_bytestokey": "npm:evp_bytestokey@1.0.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "inherits": "npm:inherits@2.0.1",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:browserify-cipher@1.0.0": {
+      "browserify-aes": "npm:browserify-aes@1.0.6",
+      "browserify-des": "npm:browserify-des@1.0.0",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "evp_bytestokey": "npm:evp_bytestokey@1.0.0"
+    },
+    "npm:browserify-des@1.0.0": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "cipher-base": "npm:cipher-base@1.0.2",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "des.js": "npm:des.js@1.0.0",
+      "inherits": "npm:inherits@2.0.1"
+    },
+    "npm:browserify-rsa@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "constants": "github:jspm/nodelibs-constants@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "randombytes": "npm:randombytes@2.0.2"
+    },
+    "npm:browserify-sign@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "browserify-rsa": "npm:browserify-rsa@4.0.0",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.2",
+      "create-hmac": "npm:create-hmac@1.1.4",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "elliptic": "npm:elliptic@6.2.3",
+      "inherits": "npm:inherits@2.0.1",
+      "parse-asn1": "npm:parse-asn1@5.0.0",
+      "stream": "github:jspm/nodelibs-stream@0.1.0"
+    },
+    "npm:buffer-xor@1.0.3": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:buffer@3.6.0": {
+      "base64-js": "npm:base64-js@0.0.8",
+      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "ieee754": "npm:ieee754@1.1.6",
+      "isarray": "npm:isarray@1.0.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:chalk@1.1.1": {
+      "ansi-styles": "npm:ansi-styles@2.1.0",
+      "escape-string-regexp": "npm:escape-string-regexp@1.0.4",
+      "has-ansi": "npm:has-ansi@2.0.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "strip-ansi": "npm:strip-ansi@3.0.0",
+      "supports-color": "npm:supports-color@2.0.0"
+    },
+    "npm:cipher-base@1.0.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "string_decoder": "github:jspm/nodelibs-string_decoder@0.1.0"
+    },
+    "npm:constants-browserify@0.0.1": {
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:convert-source-map@1.1.3": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "path": "github:jspm/nodelibs-path@0.1.0"
+    },
+    "npm:core-js@1.2.6": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:core-util-is@1.0.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
+    },
+    "npm:create-ecdh@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "elliptic": "npm:elliptic@6.2.3"
+    },
+    "npm:create-hash@1.1.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "cipher-base": "npm:cipher-base@1.0.2",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "inherits": "npm:inherits@2.0.1",
+      "ripemd160": "npm:ripemd160@1.0.1",
+      "sha.js": "npm:sha.js@2.4.4"
+    },
+    "npm:create-hmac@1.1.4": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.2",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "stream": "github:jspm/nodelibs-stream@0.1.0"
+    },
+    "npm:crypto-browserify@3.11.0": {
+      "browserify-cipher": "npm:browserify-cipher@1.0.0",
+      "browserify-sign": "npm:browserify-sign@4.0.0",
+      "create-ecdh": "npm:create-ecdh@4.0.0",
+      "create-hash": "npm:create-hash@1.1.2",
+      "create-hmac": "npm:create-hmac@1.1.4",
+      "diffie-hellman": "npm:diffie-hellman@5.0.2",
+      "inherits": "npm:inherits@2.0.1",
+      "pbkdf2": "npm:pbkdf2@3.0.4",
+      "public-encrypt": "npm:public-encrypt@4.0.0",
+      "randombytes": "npm:randombytes@2.0.2"
+    },
+    "npm:debug@2.2.0": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "ms": "npm:ms@0.7.1",
+      "net": "github:jspm/nodelibs-net@0.1.2",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "tty": "github:jspm/nodelibs-tty@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:des.js@1.0.0": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "inherits": "npm:inherits@2.0.1",
+      "minimalistic-assert": "npm:minimalistic-assert@1.0.0"
+    },
+    "npm:detect-indent@3.0.1": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "get-stdin": "npm:get-stdin@4.0.1",
+      "minimist": "npm:minimist@1.2.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "repeating": "npm:repeating@1.1.3",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:diffie-hellman@5.0.2": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "miller-rabin": "npm:miller-rabin@4.0.0",
+      "randombytes": "npm:randombytes@2.0.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:elliptic@6.2.3": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "brorand": "npm:brorand@1.0.5",
+      "hash.js": "npm:hash.js@1.0.3",
+      "inherits": "npm:inherits@2.0.1",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:es6-promise@3.0.2": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:es6-shim@0.33.13": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:evp_bytestokey@1.0.0": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.2",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0"
+    },
+    "npm:get-stdin@4.0.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:globals@8.18.0": {
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:has-ansi@2.0.0": {
+      "ansi-regex": "npm:ansi-regex@2.0.0"
+    },
+    "npm:hash.js@1.0.3": {
+      "inherits": "npm:inherits@2.0.1"
+    },
+    "npm:home-or-tmp@1.0.0": {
+      "os-tmpdir": "npm:os-tmpdir@1.0.1",
+      "user-home": "npm:user-home@1.1.1"
+    },
+    "npm:inherits@2.0.1": {
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:invariant@2.2.0": {
+      "loose-envify": "npm:loose-envify@1.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:is-finite@1.0.1": {
+      "number-is-nan": "npm:number-is-nan@1.0.0"
+    },
+    "npm:is-integer@1.0.6": {
+      "is-finite": "npm:is-finite@1.0.1"
+    },
+    "npm:json5@0.4.0": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:line-numbers@0.2.0": {
+      "left-pad": "npm:left-pad@0.0.3"
+    },
+    "npm:lodash@3.10.1": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:loose-envify@1.1.0": {
+      "js-tokens": "npm:js-tokens@1.0.2",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "stream": "github:jspm/nodelibs-stream@0.1.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:miller-rabin@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "brorand": "npm:brorand@1.0.5"
+    },
+    "npm:minimatch@2.0.10": {
+      "brace-expansion": "npm:brace-expansion@1.1.3",
+      "path": "github:jspm/nodelibs-path@0.1.0"
+    },
+    "npm:mkdirp@0.5.1": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "minimist": "npm:minimist@0.0.8",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:os-tmpdir@1.0.1": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:parse-asn1@5.0.0": {
+      "asn1.js": "npm:asn1.js@4.4.0",
+      "browserify-aes": "npm:browserify-aes@1.0.6",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.2",
+      "evp_bytestokey": "npm:evp_bytestokey@1.0.0",
+      "pbkdf2": "npm:pbkdf2@3.0.4",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:path-browserify@0.0.0": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:path-exists@1.0.0": {
+      "fs": "github:jspm/nodelibs-fs@0.1.2"
+    },
+    "npm:path-is-absolute@1.0.0": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:pbkdf2@3.0.4": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+      "create-hmac": "npm:create-hmac@1.1.4",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:process@0.11.2": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0"
+    },
+    "npm:public-encrypt@4.0.0": {
+      "bn.js": "npm:bn.js@4.10.3",
+      "browserify-rsa": "npm:browserify-rsa@4.0.0",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "create-hash": "npm:create-hash@1.1.2",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "parse-asn1": "npm:parse-asn1@5.0.0",
+      "randombytes": "npm:randombytes@2.0.2"
+    },
+    "npm:punycode@1.3.2": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:randombytes@2.0.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "crypto": "github:jspm/nodelibs-crypto@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:readable-stream@1.1.13": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "core-util-is": "npm:core-util-is@1.0.2",
+      "events": "github:jspm/nodelibs-events@0.1.1",
+      "inherits": "npm:inherits@2.0.1",
+      "isarray": "npm:isarray@0.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "stream-browserify": "npm:stream-browserify@1.0.0",
+      "string_decoder": "npm:string_decoder@0.10.31"
+    },
+    "npm:reflect-metadata@0.1.2": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:repeating@1.1.3": {
+      "is-finite": "npm:is-finite@1.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:ripemd160@1.0.1": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:rxjs@5.0.0-beta.0": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:rxjs@5.0.0-beta.2": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:sha.js@2.4.4": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "inherits": "npm:inherits@2.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:source-map-support@0.2.10": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0",
+      "child_process": "github:jspm/nodelibs-child_process@0.1.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "http": "github:jspm/nodelibs-http@1.7.1",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "querystring": "github:jspm/nodelibs-querystring@0.1.0",
+      "source-map": "npm:source-map@0.1.32"
+    },
+    "npm:source-map@0.1.32": {
+      "amdefine": "npm:amdefine@1.0.0",
+      "fs": "github:jspm/nodelibs-fs@0.1.2",
+      "path": "github:jspm/nodelibs-path@0.1.0",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:source-map@0.5.3": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:stream-browserify@1.0.0": {
+      "events": "github:jspm/nodelibs-events@0.1.1",
+      "inherits": "npm:inherits@2.0.1",
+      "readable-stream": "npm:readable-stream@1.1.13"
+    },
+    "npm:string_decoder@0.10.31": {
+      "buffer": "github:jspm/nodelibs-buffer@0.1.0"
+    },
+    "npm:strip-ansi@3.0.0": {
+      "ansi-regex": "npm:ansi-regex@2.0.0"
+    },
+    "npm:supports-color@2.0.0": {
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:timers-browserify@1.4.2": {
+      "process": "npm:process@0.11.2"
+    },
+    "npm:url@0.10.3": {
+      "assert": "github:jspm/nodelibs-assert@0.1.0",
+      "punycode": "npm:punycode@1.3.2",
+      "querystring": "npm:querystring@0.2.0",
+      "util": "github:jspm/nodelibs-util@0.1.0"
+    },
+    "npm:user-home@1.1.1": {
+      "process": "github:jspm/nodelibs-process@0.1.2",
+      "systemjs-json": "github:systemjs/plugin-json@0.1.0"
+    },
+    "npm:util@0.10.3": {
+      "inherits": "npm:inherits@2.0.1",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    },
+    "npm:vm-browserify@0.0.4": {
+      "indexof": "npm:indexof@0.0.1"
+    },
+    "npm:zone.js@0.5.14": {
+      "es6-promise": "npm:es6-promise@3.0.2",
+      "process": "github:jspm/nodelibs-process@0.1.2"
+    }
   }
 });
diff --git a/app/templates/projectFiles/typings.json b/app/templates/projectFiles/typings.json
index 41f5d50..0703e69 100644
--- a/app/templates/projectFiles/typings.json
+++ b/app/templates/projectFiles/typings.json
@@ -3,5 +3,8 @@
 	"jasmine": "github:DefinitelyTyped/DefinitelyTyped/jasmine/jasmine.d.ts#d2dd0dbfc70f5bd50aab635156620b3a2578a48d"
   },
   "devDependencies": {},
-  "ambientDependencies": {}
+  "ambientDependencies": {
+	"es6-shim": "github:DefinitelyTyped/DefinitelyTyped/es6-shim/es6-shim.d.ts#6697d6f7dadbf5773cb40ecda35a76027e0783b2",
+	"zone.js": "github:DefinitelyTyped/DefinitelyTyped/zone.js/zone.js.d.ts#9027703c0bd831319dcdf7f3169f7a468537f448"
+  }
 }
diff --git a/app/templates/projectTemplates/package.json b/app/templates/projectTemplates/package.json
index 30a5fc3..1f7cbe7 100644
--- a/app/templates/projectTemplates/package.json
+++ b/app/templates/projectTemplates/package.json
@@ -15,13 +15,12 @@
   "private": true,
   "version": "0.0.1",
   "jspm": {
-    "directories": {},
     "configFile": "jspm.conf.js",
     "dependencies": {
+      "angular2": "npm:angular2@2.0.0-beta.6",
       "babel-runtime": "npm:babel-runtime@6.5.0",
-      "rxjs": "npm:rxjs@5.0.0-beta.0",
-      "angular2": "npm:angular2@2.0.0-beta.3",
-      "normalize.css": "github:necolas/normalize.css@3.0.3"
+      "normalize.css": "github:necolas/normalize.css@3.0.3",
+      "rxjs": "npm:rxjs@5.0.0-beta.2"
     },
     "devDependencies": {
       "babel": "npm:babel-core@6.5.0"
@@ -29,11 +28,11 @@
   },
   "dependencies": {
     "babel-runtime": "6.5.x",
-    "reflect-metadata": "0.1.2",
-    "zone.js": "0.5.13",
+    "reflect-metadata": "0.1.x",
+    "zone.js": "0.5.x",
     "es6-shim": "0.33.x",
-    "rxjs": "5.0.0-beta.0",
-    "angular2": "2.0.0-beta.3"
+    "rxjs": "5.0.0-beta.2",
+    "angular2": "2.0.0-beta.6"
   },
   "devDependencies": {
     "babel-core": "6.5.x",
@@ -46,8 +45,7 @@
     "modern-web-dev-build": "0.4.x",
     "jasmine-core": "2.4.x",
     "karma-jasmine": "0.3.x",
-    "typings": "0.x",
-    "tsd": "0.6.5"
+    "typings": "0.x"
   },
   "engines": {
     "node": ">=4.2.6",
diff --git a/package.json b/package.json
index 7c526e0..7303ba5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generator-modern-web-dev",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "Modern Web Development Yeoman Generator: Gulp, ES2015, TypeScript, Angular 2, SASS, Minification, Bundling, Sourcemaps, ...",
   "author": {
     "name": "Sebastien Dubois",