diff --git a/docs/typescript-definition-package/processors/code_gen.js b/docs/typescript-definition-package/processors/code_gen.js
index 0862783b26..405b78ab11 100644
--- a/docs/typescript-definition-package/processors/code_gen.js
+++ b/docs/typescript-definition-package/processors/code_gen.js
@@ -112,6 +112,11 @@ DtsSerializer.prototype = {
     this.declaration(buffer, ast);
   },
 
+  let: function(buffer, ast) {
+    buffer.push('let ');
+    this.declaration(buffer, ast);
+  },
+
   const: function(buffer, ast) {
     buffer.push('const ');
     this.declaration(buffer, ast);
@@ -134,6 +139,7 @@ DtsSerializer.prototype = {
         case 'function': this.function(buffer, ast); break;
         case 'enum': this.enum(buffer, ast); break;
         case 'var': this.var(buffer, ast); break;
+        case 'let': this.let(buffer, ast); break;
         case 'const': this.const(buffer, ast); break;
         case 'type-alias': this.typeAlias(buffer, ast); break;
         default: throw new Error("unknown docType: " + ast.docType);
diff --git a/docs/typescript-package/processors/readTypeScriptModules.js b/docs/typescript-package/processors/readTypeScriptModules.js
index 8ddb726eaa..51e56a4242 100644
--- a/docs/typescript-package/processors/readTypeScriptModules.js
+++ b/docs/typescript-package/processors/readTypeScriptModules.js
@@ -59,10 +59,7 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
           if (anyMatches(ignoreExportsMatching, exportSymbol.name)) return;
 
           // If the symbol is an Alias then for most things we want the original resolved symbol
-          var resolvedExport = exportSymbol;
-          if (exportSymbol.resolvedSymbol && exportSymbol.resolvedSymbol.name !== "unknown") {
-            resolvedExport = exportSymbol.resolvedSymbol;
-          }
+          var resolvedExport = exportSymbol.resolvedSymbol || exportSymbol;
           var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker);
           log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id);
 
@@ -285,11 +282,7 @@ module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
 
 
   function getDecorators(symbol) {
-    var declaration = symbol.valueDeclaration;
-    if (!declaration) {
-      console.log("missing declaration for symbol", declaration);
-      return [];
-    }
+    var declaration = symbol.valueDeclaration || symbol.declarations[0];
     var sourceFile = ts.getSourceFileOfNode(declaration);
 
     var decorators = declaration.decorators && declaration.decorators.map(function(decorator) {
diff --git a/docs/typescript-package/services/tsParser/createCompilerHost.js b/docs/typescript-package/services/tsParser/createCompilerHost.js
index 0b718ebeac..0dc488b0b8 100644
--- a/docs/typescript-package/services/tsParser/createCompilerHost.js
+++ b/docs/typescript-package/services/tsParser/createCompilerHost.js
@@ -58,11 +58,17 @@ module.exports = function createCompilerHost(log) {
         return ts.sys.newLine;
       },
       fileExists: function(fileName) {
-        var stats;
-        fs.stat(fileName, function(err, s) {
-           stats = s;
-        });
-        return !!stats;
+        var resolvedPath = path.resolve(baseDir, fileName);
+        try {
+          fs.statSync(resolvedPath);
+          return true;
+        } catch (e) {
+          return false;
+        }
+      },
+      readFile: function(fileName) {
+        var resolvedPath = path.resolve(baseDir, fileName);
+        return fs.readFileSync(resolvedPath, { encoding: options.charset });
       }
     };
   };
diff --git a/docs/typescript-package/services/tsParser/getFileInfo.js b/docs/typescript-package/services/tsParser/getFileInfo.js
index 5c753835e1..4f6d64bbe1 100644
--- a/docs/typescript-package/services/tsParser/getFileInfo.js
+++ b/docs/typescript-package/services/tsParser/getFileInfo.js
@@ -4,9 +4,6 @@ var ts = require('typescript');
 module.exports = function getFileInfo(log) {
 
   return function (symbol, basePath) {
-    if (!symbol.declarations) {
-      console.log("ouch", symbol);
-    }
     var fileName = ts.getSourceFileOfNode(symbol.declarations[0]).fileName;
 
     var file = path.resolve(basePath, fileName);
diff --git a/gulpfile.js b/gulpfile.js
index 68d6cf471e..9070c769b9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -298,7 +298,11 @@ gulp.task('lint', ['build.tools'], function() {
     }
   };
   return gulp.src(['modules/angular2/src/**/*.ts', '!modules/angular2/src/test_lib/**'])
-      .pipe(tslint({configuration: tslintConfig, rulesDirectory: 'dist/tools/tslint'}))
+      .pipe(tslint({
+        tslint: require('tslint'),
+        configuration: tslintConfig,
+        rulesDirectory: 'dist/tools/tslint'
+      }))
       .pipe(tslint.report('prose', {emitError: true}));
 });
 
diff --git a/modules/angular2/src/compiler/template_compiler.ts b/modules/angular2/src/compiler/template_compiler.ts
index 87d85ac22e..7e774c4886 100644
--- a/modules/angular2/src/compiler/template_compiler.ts
+++ b/modules/angular2/src/compiler/template_compiler.ts
@@ -162,7 +162,7 @@ export class TemplateCompiler {
     });
     ListWrapper.forEachWithIndex(componentMetas, (compMeta: CompileDirectiveMetadata,
                                                   index: number) => {
-      var templateDataFn = codeGenValueFn([], `[${templateArguments[index].join(',')}]`);
+      var templateDataFn = codeGenValueFn([], `[${(<any[]>templateArguments[index]).join(',')}]`);
       declarations.push(
           `${codeGenExportVariable(templateVariableName(compMeta.type))}new ${TEMPLATE_COMMANDS_MODULE_REF}CompiledTemplate(${compMeta.type.id},${templateDataFn});`);
     });
diff --git a/modules/angular2/src/core/change_detection/abstract_change_detector.ts b/modules/angular2/src/core/change_detection/abstract_change_detector.ts
index 03ef64b95e..8374315722 100644
--- a/modules/angular2/src/core/change_detection/abstract_change_detector.ts
+++ b/modules/angular2/src/core/change_detection/abstract_change_detector.ts
@@ -216,7 +216,7 @@ export class AbstractChangeDetector<T> implements ChangeDetector {
   }
 
   // This is an experimental feature. Works only in Dart.
-  protected observeValue(value: any, index: number): any {
+  observeValue(value: any, index: number): any {
     if (isObservable(value)) {
       this._createArrayToStoreObservables();
       if (isBlank(this.subscriptions[index])) {
@@ -232,7 +232,7 @@ export class AbstractChangeDetector<T> implements ChangeDetector {
   }
 
   // This is an experimental feature. Works only in Dart.
-  protected observeDirective(value: any, index: number): any {
+  observeDirective(value: any, index: number): any {
     if (isObservable(value)) {
       this._createArrayToStoreObservables();
       var arrayIndex = this.numberOfPropertyProtoRecords + index + 2;  // +1 is component
@@ -243,7 +243,7 @@ export class AbstractChangeDetector<T> implements ChangeDetector {
   }
 
   // This is an experimental feature. Works only in Dart.
-  protected observeComponent(value: any): any {
+  observeComponent(value: any): any {
     if (isObservable(value)) {
       this._createArrayToStoreObservables();
       var index = this.numberOfPropertyProtoRecords + 1;
@@ -262,24 +262,23 @@ export class AbstractChangeDetector<T> implements ChangeDetector {
     }
   }
 
-  protected getDirectiveFor(directives: any, index: number): any {
+  getDirectiveFor(directives: any, index: number): any {
     return directives.getDirectiveFor(this.directiveIndices[index]);
   }
 
-  protected getDetectorFor(directives: any, index: number): ChangeDetector {
+  getDetectorFor(directives: any, index: number): ChangeDetector {
     return directives.getDetectorFor(this.directiveIndices[index]);
   }
 
-  protected notifyDispatcher(value: any): void {
+  notifyDispatcher(value: any): void {
     this.dispatcher.notifyOnBinding(this._currentBinding(), value);
   }
 
-  protected logBindingUpdate(value: any): void {
+  logBindingUpdate(value: any): void {
     this.dispatcher.logBindingUpdate(this._currentBinding(), value);
   }
 
-  protected addChange(changes: StringMap<string, any>, oldValue: any,
-                      newValue: any): StringMap<string, any> {
+  addChange(changes: StringMap<string, any>, oldValue: any, newValue: any): StringMap<string, any> {
     if (isBlank(changes)) {
       changes = {};
     }
@@ -295,12 +294,12 @@ export class AbstractChangeDetector<T> implements ChangeDetector {
     throw new ChangeDetectionError(this._currentBinding().debug, exception, stack, context);
   }
 
-  protected throwOnChangeError(oldValue: any, newValue: any): void {
+  throwOnChangeError(oldValue: any, newValue: any): void {
     throw new ExpressionChangedAfterItHasBeenCheckedException(this._currentBinding().debug,
                                                               oldValue, newValue, null);
   }
 
-  protected throwDehydratedError(): void { throw new DehydratedException(); }
+  throwDehydratedError(): void { throw new DehydratedException(); }
 
   private _currentBinding(): BindingTarget {
     return this.bindingTargets[this.propertyBindingIndex];
diff --git a/modules/angular2/src/core/compiler/directive_resolver.ts b/modules/angular2/src/core/compiler/directive_resolver.ts
index 23a022a2ec..9d87b8f50e 100644
--- a/modules/angular2/src/core/compiler/directive_resolver.ts
+++ b/modules/angular2/src/core/compiler/directive_resolver.ts
@@ -77,7 +77,7 @@ export class DirectiveResolver {
         }
 
         if (a instanceof HostListenerMetadata) {
-          var args = isPresent(a.args) ? a.args.join(', ') : '';
+          var args = isPresent(a.args) ? (<any[]>a.args).join(', ') : '';
           host[`(${a.eventName})`] = `${propName}(${args})`;
         }
 
diff --git a/modules/angular2/src/core/facade/exception_handler.ts b/modules/angular2/src/core/facade/exception_handler.ts
index e07eccbb45..23fc7e3d66 100644
--- a/modules/angular2/src/core/facade/exception_handler.ts
+++ b/modules/angular2/src/core/facade/exception_handler.ts
@@ -83,7 +83,7 @@ export class ExceptionHandler {
   }
 
   _longStackTrace(stackTrace: any): any {
-    return isListLikeIterable(stackTrace) ? (<any>stackTrace).join("\n\n-----async gap-----\n") :
+    return isListLikeIterable(stackTrace) ? (<any[]>stackTrace).join("\n\n-----async gap-----\n") :
                                             stackTrace.toString();
   }
 
diff --git a/modules/angular2/src/core/render/dom/compiler/style_inliner.ts b/modules/angular2/src/core/render/dom/compiler/style_inliner.ts
index 3c1ac8123b..a1dd130671 100644
--- a/modules/angular2/src/core/render/dom/compiler/style_inliner.ts
+++ b/modules/angular2/src/core/render/dom/compiler/style_inliner.ts
@@ -91,7 +91,7 @@ export class StyleInliner {
     }
 
     return PromiseWrapper.all(promises).then(function(cssParts) {
-      var cssText = cssParts.join('');
+      var cssText = (<any[]>cssParts).join('');
       if (partIndex < parts.length) {
         // append then content located after the last @import rule
         cssText += parts[partIndex];
diff --git a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts b/modules/angular2/src/core/render/dom/view/shared_styles_host.ts
index a5ab44a1c1..5698894bfa 100644
--- a/modules/angular2/src/core/render/dom/view/shared_styles_host.ts
+++ b/modules/angular2/src/core/render/dom/view/shared_styles_host.ts
@@ -5,8 +5,8 @@ import {DOCUMENT} from '../dom_tokens';
 
 @Injectable()
 export class SharedStylesHost {
-  protected _styles: string[] = [];
-  protected _stylesSet: Set<string> = new Set();
+  _styles: string[] = [];
+  _stylesSet: Set<string> = new Set();
 
   constructor() {}
 
@@ -22,7 +22,7 @@ export class SharedStylesHost {
     this.onStylesAdded(additions);
   }
 
-  protected onStylesAdded(additions: string[]) {}
+  onStylesAdded(additions: string[]) {}
 
   getAllStyles(): string[] { return this._styles; }
 }
diff --git a/modules/angular2/src/http/http.ts b/modules/angular2/src/http/http.ts
index 773b191760..159191f6e8 100644
--- a/modules/angular2/src/http/http.ts
+++ b/modules/angular2/src/http/http.ts
@@ -20,10 +20,7 @@ function mergeOptions(defaultOpts, providedOpts, method, url): RequestOptions {
       url: providedOpts.url,
       search: providedOpts.search,
       headers: providedOpts.headers,
-      body: providedOpts.body,
-      mode: providedOpts.mode,
-      credentials: providedOpts.credentials,
-      cache: providedOpts.cache
+      body: providedOpts.body
     }));
   }
   if (isPresent(method)) {
diff --git a/modules/angular2/src/http/interfaces.ts b/modules/angular2/src/http/interfaces.ts
index 7422836598..99e40cf8e9 100644
--- a/modules/angular2/src/http/interfaces.ts
+++ b/modules/angular2/src/http/interfaces.ts
@@ -40,9 +40,6 @@ export type RequestOptionsArgs = {
   headers?: Headers;
   // TODO: Support Blob, ArrayBuffer, JSON, URLSearchParams, FormData
   body?: string;
-  mode?: any;
-  credentials?: any;
-  cache?: any;
 }
 
 /**
diff --git a/modules/angular2/src/web_workers/shared/client_message_broker.ts b/modules/angular2/src/web_workers/shared/client_message_broker.ts
index a1e911c4b8..2b47fd1265 100644
--- a/modules/angular2/src/web_workers/shared/client_message_broker.ts
+++ b/modules/angular2/src/web_workers/shared/client_message_broker.ts
@@ -19,7 +19,7 @@ export class ClientMessageBrokerFactory {
   /**
    * @private
    */
-  constructor(private _messageBus: MessageBus, protected _serializer: Serializer) {}
+  constructor(private _messageBus: MessageBus, public _serializer: Serializer) {}
 
   /**
    * Initializes the given channel and attaches a new {@link ClientMessageBroker} to it.
@@ -37,7 +37,7 @@ export class ClientMessageBroker {
   /**
    * @private
    */
-  constructor(messageBus: MessageBus, protected _serializer: Serializer, public channel) {
+  constructor(messageBus: MessageBus, public _serializer: Serializer, public channel) {
     this._sink = messageBus.to(channel);
     var source = messageBus.from(channel);
     ObservableWrapper.subscribe(source,
diff --git a/modules/angular2/src/web_workers/shared/service_message_broker.ts b/modules/angular2/src/web_workers/shared/service_message_broker.ts
index 1548551a83..0a2027172b 100644
--- a/modules/angular2/src/web_workers/shared/service_message_broker.ts
+++ b/modules/angular2/src/web_workers/shared/service_message_broker.ts
@@ -15,7 +15,7 @@ export class ServiceMessageBrokerFactory {
   /**
    * @private
    */
-  constructor(private _messageBus: MessageBus, protected _serializer: Serializer) {}
+  constructor(private _messageBus: MessageBus, public _serializer: Serializer) {}
 
   /**
    * Initializes the given channel and attaches a new {@link ServiceMessageBroker} to it.
diff --git a/npm-shrinkwrap.clean.json b/npm-shrinkwrap.clean.json
index 11143381ef..e2dea72a74 100644
--- a/npm-shrinkwrap.clean.json
+++ b/npm-shrinkwrap.clean.json
@@ -7003,7 +7003,7 @@
           }
         },
         "source-map": {
-          "version": "0.5.0"
+          "version": "0.5.1"
         },
         "through2": {
           "version": "2.0.0",
@@ -10666,9 +10666,56 @@
         }
       }
     },
+    "tslint": {
+      "version": "2.5.0",
+      "dependencies": {
+        "findup-sync": {
+          "version": "0.2.1",
+          "dependencies": {
+            "glob": {
+              "version": "4.3.5",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1"
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.3"
+            },
+            "minimist": {
+              "version": "0.0.10"
+            }
+          }
+        },
+        "underscore.string": {
+          "version": "3.1.1"
+        }
+      }
+    },
     "typescript": {
-      "version": "1.6.2",
-      "resolved": "git://github.com/alexeagle/TypeScript.git#64a03791c15c828c45c19cecd1f1b13df5b271a3"
+      "version": "1.6.2"
     },
     "vinyl": {
       "version": "0.4.6",
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index cbe591dc97..054a7a3c54 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -3429,7 +3429,7 @@
                   "dependencies": {
                     "wordwrap": {
                       "version": "0.0.3",
-                      "from": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+                      "from": "wordwrap@>=0.0.2 <0.1.0",
                       "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
                     },
                     "minimist": {
@@ -10580,103 +10580,103 @@
     },
     "gulp-typescript": {
       "version": "2.9.0",
-      "from": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.9.0.tgz",
+      "from": "gulp-typescript@2.9.0",
       "resolved": "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-2.9.0.tgz",
       "dependencies": {
         "gulp-util": {
           "version": "3.0.6",
-          "from": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz",
+          "from": "gulp-util@>=3.0.6 <3.1.0",
           "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.6.tgz",
           "dependencies": {
             "array-differ": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz",
+              "from": "array-differ@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
             },
             "array-uniq": {
               "version": "1.0.2",
-              "from": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz",
+              "from": "array-uniq@>=1.0.2 <2.0.0",
               "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.2.tgz"
             },
             "beeper": {
               "version": "1.1.0",
-              "from": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz",
+              "from": "beeper@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.0.tgz"
             },
             "chalk": {
               "version": "1.1.1",
-              "from": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
+              "from": "chalk@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
               "dependencies": {
                 "ansi-styles": {
                   "version": "2.1.0",
-                  "from": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz",
+                  "from": "ansi-styles@>=2.1.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
                 },
                 "escape-string-regexp": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz",
+                  "from": "escape-string-regexp@>=1.0.2 <2.0.0",
                   "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
                 },
                 "has-ansi": {
                   "version": "2.0.0",
-                  "from": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+                  "from": "has-ansi@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "2.0.0",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "strip-ansi": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
+                  "from": "strip-ansi@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
                   "dependencies": {
                     "ansi-regex": {
                       "version": "2.0.0",
-                      "from": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz",
+                      "from": "ansi-regex@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
                     }
                   }
                 },
                 "supports-color": {
                   "version": "2.0.0",
-                  "from": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+                  "from": "supports-color@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
                 }
               }
             },
             "dateformat": {
               "version": "1.0.11",
-              "from": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
+              "from": "dateformat@>=1.0.11 <2.0.0",
               "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-1.0.11.tgz",
               "dependencies": {
                 "get-stdin": {
                   "version": "5.0.0",
-                  "from": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz",
+                  "from": "get-stdin@*",
                   "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.0.tgz"
                 },
                 "meow": {
                   "version": "3.3.0",
-                  "from": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz",
+                  "from": "meow@*",
                   "resolved": "https://registry.npmjs.org/meow/-/meow-3.3.0.tgz",
                   "dependencies": {
                     "camelcase-keys": {
                       "version": "1.0.0",
-                      "from": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
+                      "from": "camelcase-keys@>=1.0.0 <2.0.0",
                       "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-1.0.0.tgz",
                       "dependencies": {
                         "camelcase": {
                           "version": "1.2.1",
-                          "from": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz",
+                          "from": "camelcase@>=1.0.1 <2.0.0",
                           "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"
                         },
                         "map-obj": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz",
+                          "from": "map-obj@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"
                         }
                       }
@@ -10687,116 +10687,116 @@
             },
             "lodash._reescape": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz",
+              "from": "lodash._reescape@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
             },
             "lodash._reevaluate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz",
+              "from": "lodash._reevaluate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
             },
             "lodash._reinterpolate": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+              "from": "lodash._reinterpolate@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
             },
             "lodash.template": {
               "version": "3.6.2",
-              "from": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
+              "from": "lodash.template@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz",
               "dependencies": {
                 "lodash._basecopy": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+                  "from": "lodash._basecopy@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
                 },
                 "lodash._basetostring": {
                   "version": "3.0.1",
-                  "from": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz",
+                  "from": "lodash._basetostring@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
                 },
                 "lodash._basevalues": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz",
+                  "from": "lodash._basevalues@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
                 },
                 "lodash._isiterateecall": {
                   "version": "3.0.9",
-                  "from": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+                  "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
                 },
                 "lodash.escape": {
                   "version": "3.0.0",
-                  "from": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz",
+                  "from": "lodash.escape@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.0.0.tgz"
                 },
                 "lodash.keys": {
                   "version": "3.1.2",
-                  "from": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+                  "from": "lodash.keys@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
                   "dependencies": {
                     "lodash._getnative": {
                       "version": "3.9.1",
-                      "from": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+                      "from": "lodash._getnative@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
                     },
                     "lodash.isarguments": {
                       "version": "3.0.4",
-                      "from": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz",
+                      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.0.4.tgz"
                     },
                     "lodash.isarray": {
                       "version": "3.0.4",
-                      "from": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+                      "from": "lodash.isarray@>=3.0.0 <4.0.0",
                       "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
                     }
                   }
                 },
                 "lodash.restparam": {
                   "version": "3.6.1",
-                  "from": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+                  "from": "lodash.restparam@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
                 },
                 "lodash.templatesettings": {
                   "version": "3.1.0",
-                  "from": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz",
+                  "from": "lodash.templatesettings@>=3.0.0 <4.0.0",
                   "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.0.tgz"
                 }
               }
             },
             "multipipe": {
               "version": "0.1.2",
-              "from": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
+              "from": "multipipe@>=0.1.2 <0.2.0",
               "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz",
               "dependencies": {
                 "duplexer2": {
                   "version": "0.0.2",
-                  "from": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
+                  "from": "duplexer2@0.0.2",
                   "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz",
                   "dependencies": {
                     "readable-stream": {
                       "version": "1.1.13",
-                      "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
+                      "from": "readable-stream@>=1.1.9 <1.2.0",
                       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz",
                       "dependencies": {
                         "core-util-is": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                          "from": "core-util-is@>=1.0.0 <1.1.0",
                           "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                         },
                         "isarray": {
                           "version": "0.0.1",
-                          "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                          "from": "isarray@0.0.1",
                           "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                         },
                         "string_decoder": {
                           "version": "0.10.31",
-                          "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                          "from": "string_decoder@>=0.10.0 <0.11.0",
                           "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                         },
                         "inherits": {
                           "version": "2.0.1",
-                          "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                          "from": "inherits@>=2.0.1 <2.1.0",
                           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                         }
                       }
@@ -10807,27 +10807,27 @@
             },
             "object-assign": {
               "version": "3.0.0",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz",
+              "from": "object-assign@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
             },
             "replace-ext": {
               "version": "0.0.1",
-              "from": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz",
+              "from": "replace-ext@0.0.1",
               "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
             },
             "vinyl": {
               "version": "0.5.3",
-              "from": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
+              "from": "vinyl@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz",
               "dependencies": {
                 "clone": {
                   "version": "1.0.2",
-                  "from": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz",
+                  "from": "clone@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz"
                 },
                 "clone-stats": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz",
+                  "from": "clone-stats@>=0.0.1 <0.0.2",
                   "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
                 }
               }
@@ -10835,48 +10835,48 @@
           }
         },
         "source-map": {
-          "version": "0.5.0",
-          "from": "https://registry.npmjs.org/source-map/-/source-map-0.5.0.tgz",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.0.tgz"
+          "version": "0.5.1",
+          "from": "source-map@>=0.5.0 <0.6.0",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.1.tgz"
         },
         "through2": {
           "version": "2.0.0",
-          "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+          "from": "through2@>=2.0.0 <2.1.0",
           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
           "dependencies": {
             "readable-stream": {
               "version": "2.0.2",
-              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+              "from": "readable-stream@>=2.0.0 <2.1.0",
               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
               "dependencies": {
                 "core-util-is": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                  "from": "core-util-is@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                 },
                 "inherits": {
                   "version": "2.0.1",
-                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "from": "inherits@>=2.0.1 <2.1.0",
                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                 },
                 "isarray": {
                   "version": "0.0.1",
-                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                  "from": "isarray@0.0.1",
                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                 },
                 "process-nextick-args": {
                   "version": "1.0.3",
-                  "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
                   "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                 },
                 "string_decoder": {
                   "version": "0.10.31",
-                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                  "from": "string_decoder@>=0.10.0 <0.11.0",
                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                 },
                 "util-deprecate": {
                   "version": "1.0.1",
-                  "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
+                  "from": "util-deprecate@>=1.0.1 <1.1.0",
                   "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
                 }
               }
@@ -10885,27 +10885,27 @@
         },
         "vinyl-fs": {
           "version": "1.0.0",
-          "from": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
+          "from": "vinyl-fs@>=1.0.0 <1.1.0",
           "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-1.0.0.tgz",
           "dependencies": {
             "duplexify": {
               "version": "3.4.2",
-              "from": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
+              "from": "duplexify@>=3.2.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.4.2.tgz",
               "dependencies": {
                 "end-of-stream": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+                  "from": "end-of-stream@1.0.0",
                   "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
                   "dependencies": {
                     "once": {
                       "version": "1.3.2",
-                      "from": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                      "from": "once@>=1.3.0 <1.4.0",
                       "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
                       "dependencies": {
                         "wrappy": {
                           "version": "1.0.1",
-                          "from": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz",
+                          "from": "wrappy@>=1.0.0 <2.0.0",
                           "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
                         }
                       }
@@ -10914,37 +10914,37 @@
                 },
                 "readable-stream": {
                   "version": "2.0.2",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                  "from": "readable-stream@>=2.0.0 <3.0.0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "process-nextick-args": {
                       "version": "1.0.3",
-                      "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+                      "from": "process-nextick-args@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "util-deprecate": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
+                      "from": "util-deprecate@>=1.0.1 <1.1.0",
                       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
                     }
                   }
@@ -10953,74 +10953,74 @@
             },
             "glob-stream": {
               "version": "4.1.1",
-              "from": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
+              "from": "glob-stream@>=4.0.1 <5.0.0",
               "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-4.1.1.tgz",
               "dependencies": {
                 "ordered-read-streams": {
                   "version": "0.1.0",
-                  "from": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz",
+                  "from": "ordered-read-streams@>=0.1.0 <0.2.0",
                   "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"
                 },
                 "glob2base": {
                   "version": "0.0.12",
-                  "from": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
+                  "from": "glob2base@>=0.0.12 <0.0.13",
                   "resolved": "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz",
                   "dependencies": {
                     "find-index": {
                       "version": "0.1.1",
-                      "from": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz",
+                      "from": "find-index@>=0.1.1 <0.2.0",
                       "resolved": "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"
                     }
                   }
                 },
                 "unique-stream": {
                   "version": "2.2.0",
-                  "from": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
+                  "from": "unique-stream@>=2.0.2 <3.0.0",
                   "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.0.tgz",
                   "dependencies": {
                     "through2-filter": {
                       "version": "2.0.0",
-                      "from": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
+                      "from": "through2-filter@>=2.0.0 <3.0.0",
                       "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz",
                       "dependencies": {
                         "through2": {
                           "version": "2.0.0",
-                          "from": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
+                          "from": "through2@>=2.0.0 <2.1.0",
                           "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.0.tgz",
                           "dependencies": {
                             "readable-stream": {
                               "version": "2.0.2",
-                              "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
+                              "from": "readable-stream@>=2.0.0 <2.1.0",
                               "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.2.tgz",
                               "dependencies": {
                                 "core-util-is": {
                                   "version": "1.0.1",
-                                  "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                                  "from": "core-util-is@>=1.0.0 <1.1.0",
                                   "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                                 },
                                 "inherits": {
                                   "version": "2.0.1",
-                                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                                  "from": "inherits@>=2.0.1 <2.1.0",
                                   "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                                 },
                                 "isarray": {
                                   "version": "0.0.1",
-                                  "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                                  "from": "isarray@0.0.1",
                                   "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                                 },
                                 "process-nextick-args": {
                                   "version": "1.0.3",
-                                  "from": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz",
+                                  "from": "process-nextick-args@>=1.0.0 <1.1.0",
                                   "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.3.tgz"
                                 },
                                 "string_decoder": {
                                   "version": "0.10.31",
-                                  "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                                  "from": "string_decoder@>=0.10.0 <0.11.0",
                                   "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                                 },
                                 "util-deprecate": {
                                   "version": "1.0.1",
-                                  "from": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz",
+                                  "from": "util-deprecate@>=1.0.1 <1.1.0",
                                   "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.1.tgz"
                                 }
                               }
@@ -11035,54 +11035,54 @@
             },
             "glob-watcher": {
               "version": "0.0.8",
-              "from": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
+              "from": "glob-watcher@>=0.0.8 <0.0.9",
               "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.8.tgz",
               "dependencies": {
                 "gaze": {
                   "version": "0.5.1",
-                  "from": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
+                  "from": "gaze@>=0.5.1 <0.6.0",
                   "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.1.tgz",
                   "dependencies": {
                     "globule": {
                       "version": "0.1.0",
-                      "from": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
+                      "from": "globule@>=0.1.0 <0.2.0",
                       "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
                       "dependencies": {
                         "lodash": {
                           "version": "1.0.2",
-                          "from": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz",
+                          "from": "lodash@>=1.0.1 <1.1.0",
                           "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
                         },
                         "glob": {
                           "version": "3.1.21",
-                          "from": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
+                          "from": "glob@>=3.1.21 <3.2.0",
                           "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz",
                           "dependencies": {
                             "graceful-fs": {
                               "version": "1.2.3",
-                              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz",
+                              "from": "graceful-fs@>=1.2.0 <1.3.0",
                               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
                             },
                             "inherits": {
                               "version": "1.0.2",
-                              "from": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz",
+                              "from": "inherits@>=1.0.0 <2.0.0",
                               "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
                             }
                           }
                         },
                         "minimatch": {
                           "version": "0.2.14",
-                          "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
+                          "from": "minimatch@>=0.2.11 <0.3.0",
                           "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz",
                           "dependencies": {
                             "lru-cache": {
                               "version": "2.7.0",
-                              "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
+                              "from": "lru-cache@>=2.0.0 <3.0.0",
                               "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                             },
                             "sigmund": {
                               "version": "1.0.1",
-                              "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+                              "from": "sigmund@>=1.0.0 <1.1.0",
                               "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                             }
                           }
@@ -11095,76 +11095,76 @@
             },
             "graceful-fs": {
               "version": "3.0.8",
-              "from": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz",
+              "from": "graceful-fs@>=3.0.0 <4.0.0",
               "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.8.tgz"
             },
             "merge-stream": {
               "version": "0.1.8",
-              "from": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz",
+              "from": "merge-stream@>=0.1.7 <0.2.0",
               "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-0.1.8.tgz"
             },
             "mkdirp": {
               "version": "0.5.1",
-              "from": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+              "from": "mkdirp@>=0.5.0 <0.6.0",
               "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
               "dependencies": {
                 "minimist": {
                   "version": "0.0.8",
-                  "from": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+                  "from": "minimist@0.0.8",
                   "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"
                 }
               }
             },
             "object-assign": {
               "version": "2.1.1",
-              "from": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+              "from": "object-assign@>=2.0.0 <3.0.0",
               "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz"
             },
             "strip-bom": {
               "version": "1.0.0",
-              "from": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
+              "from": "strip-bom@>=1.0.0 <2.0.0",
               "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz",
               "dependencies": {
                 "first-chunk-stream": {
                   "version": "1.0.0",
-                  "from": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz",
+                  "from": "first-chunk-stream@>=1.0.0 <2.0.0",
                   "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
                 },
                 "is-utf8": {
                   "version": "0.2.0",
-                  "from": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz",
+                  "from": "is-utf8@>=0.2.0 <0.3.0",
                   "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.0.tgz"
                 }
               }
             },
             "through2": {
               "version": "0.6.5",
-              "from": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
+              "from": "through2@>=0.6.1 <0.7.0",
               "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz",
               "dependencies": {
                 "readable-stream": {
                   "version": "1.0.33",
-                  "from": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
+                  "from": "readable-stream@>=1.0.33-1 <1.1.0-0",
                   "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz",
                   "dependencies": {
                     "core-util-is": {
                       "version": "1.0.1",
-                      "from": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz",
+                      "from": "core-util-is@>=1.0.0 <1.1.0",
                       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz"
                     },
                     "isarray": {
                       "version": "0.0.1",
-                      "from": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+                      "from": "isarray@0.0.1",
                       "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
                     },
                     "string_decoder": {
                       "version": "0.10.31",
-                      "from": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+                      "from": "string_decoder@>=0.10.0 <0.11.0",
                       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
                     },
                     "inherits": {
                       "version": "2.0.1",
-                      "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                      "from": "inherits@>=2.0.1 <2.1.0",
                       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
                     }
                   }
@@ -12157,32 +12157,32 @@
     },
     "hash-files": {
       "version": "1.0.0",
-      "from": "hash-files@>=1.0.0 <2.0.0",
+      "from": "https://registry.npmjs.org/hash-files/-/hash-files-1.0.0.tgz",
       "resolved": "https://registry.npmjs.org/hash-files/-/hash-files-1.0.0.tgz",
       "dependencies": {
         "glob": {
           "version": "3.2.11",
-          "from": "glob@>=3.0.0 <4.0.0",
+          "from": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
           "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
           "dependencies": {
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@>=2.0.0 <3.0.0",
+              "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
               "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
             },
             "minimatch": {
               "version": "0.3.0",
-              "from": "minimatch@>=0.3.0 <0.4.0",
+              "from": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
               "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
               "dependencies": {
                 "lru-cache": {
                   "version": "2.7.0",
-                  "from": "lru-cache@>=2.0.0 <3.0.0",
+                  "from": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz",
                   "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.7.0.tgz"
                 },
                 "sigmund": {
                   "version": "1.0.1",
-                  "from": "sigmund@>=1.0.0 <1.1.0",
+                  "from": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
                   "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz"
                 }
               }
@@ -12191,17 +12191,17 @@
         },
         "read-files": {
           "version": "0.1.0",
-          "from": "read-files@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/read-files/-/read-files-0.1.0.tgz",
           "resolved": "https://registry.npmjs.org/read-files/-/read-files-0.1.0.tgz"
         },
         "underscore": {
           "version": "1.8.3",
-          "from": "underscore@>=1.0.0 <2.0.0",
+          "from": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
           "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"
         },
         "async": {
           "version": "0.9.2",
-          "from": "async@>=0.0.0 <1.0.0",
+          "from": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
           "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz"
         }
       }
@@ -16490,10 +16490,82 @@
         }
       }
     },
+    "tslint": {
+      "version": "2.5.0",
+      "from": "tslint@>=2.5.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-2.5.0.tgz",
+      "dependencies": {
+        "findup-sync": {
+          "version": "0.2.1",
+          "from": "findup-sync@>=0.2.1 <0.3.0",
+          "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-0.2.1.tgz",
+          "dependencies": {
+            "glob": {
+              "version": "4.3.5",
+              "from": "glob@>=4.3.0 <4.4.0",
+              "resolved": "https://registry.npmjs.org/glob/-/glob-4.3.5.tgz",
+              "dependencies": {
+                "inflight": {
+                  "version": "1.0.4",
+                  "from": "inflight@>=1.0.4 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                },
+                "inherits": {
+                  "version": "2.0.1",
+                  "from": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+                  "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
+                },
+                "once": {
+                  "version": "1.3.2",
+                  "from": "once@>=1.3.0 <2.0.0",
+                  "resolved": "https://registry.npmjs.org/once/-/once-1.3.2.tgz",
+                  "dependencies": {
+                    "wrappy": {
+                      "version": "1.0.1",
+                      "from": "wrappy@>=1.0.0 <2.0.0",
+                      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "optimist": {
+          "version": "0.6.1",
+          "from": "optimist@>=0.6.0 <0.7.0",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+          "dependencies": {
+            "wordwrap": {
+              "version": "0.0.3",
+              "from": "wordwrap@>=0.0.2 <0.1.0",
+              "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"
+            },
+            "minimist": {
+              "version": "0.0.10",
+              "from": "minimist@>=0.0.1 <0.1.0",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
+            }
+          }
+        },
+        "underscore.string": {
+          "version": "3.1.1",
+          "from": "underscore.string@>=3.1.1 <3.2.0",
+          "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.1.1.tgz"
+        }
+      }
+    },
     "typescript": {
       "version": "1.6.2",
-      "from": "git://github.com/alexeagle/TypeScript.git#64a03791c15c828c45c19cecd1f1b13df5b271a3",
-      "resolved": "git://github.com/alexeagle/TypeScript.git#64a03791c15c828c45c19cecd1f1b13df5b271a3"
+      "from": "https://registry.npmjs.org/typescript/-/typescript-1.6.2.tgz",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-1.6.2.tgz"
     },
     "vinyl": {
       "version": "0.4.6",
diff --git a/package.json b/package.json
index cba5d689e6..b61247a44a 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "gulp-template": "^3.0.0",
     "gulp-traceur": "0.17.*",
     "gulp-tslint": "^3.3.0-beta",
-    "gulp-typescript": "^2.6.0",
+    "gulp-typescript": "^2.9.0",
     "gulp-uglify": "^1.2.0",
     "gulp-webserver": "^0.8.7",
     "hash-files": "^1.0.0",
@@ -128,9 +128,10 @@
     "temp": "^0.8.1",
     "ternary-stream": "^1.2.3",
     "through2": "^0.6.1",
-    "ts2dart": "^0.7.0",
+    "ts2dart": "^0.7.5",
     "tsd": "^0.6.5-beta",
-    "typescript": "alexeagle/TypeScript#1.6_error_is_class",
+    "tslint": "^2.5.0",
+    "typescript": "^1.6.2",
     "vinyl": "^0.4.6",
     "walk-sync": "^0.1.3",
     "which": "~1",
diff --git a/tools/broccoli/broccoli-typescript.ts b/tools/broccoli/broccoli-typescript.ts
index c70a93d6bf..9370c571ba 100644
--- a/tools/broccoli/broccoli-typescript.ts
+++ b/tools/broccoli/broccoli-typescript.ts
@@ -188,7 +188,6 @@ class CustomLanguageServiceHost implements ts.LanguageServiceHost {
   constructor(private compilerOptions: ts.CompilerOptions, private fileNames: string[],
               private fileRegistry: FileRegistry, private treeInputPath: string) {
     this.currentDirectory = process.cwd();
-    console.log("compilerOptions", compilerOptions);
     this.defaultLibFilePath = ts.getDefaultLibFilePath(compilerOptions).replace(/\\/g, '/');
   }
 
@@ -235,12 +234,9 @@ class CustomLanguageServiceHost implements ts.LanguageServiceHost {
 
   getCurrentDirectory(): string { return this.currentDirectory; }
 
-
   getCompilationSettings(): ts.CompilerOptions { return this.compilerOptions; }
 
-
   getDefaultLibFileName(options: ts.CompilerOptions): string {
-    console.log("defaultLibFilePath", this.defaultLibFilePath);
     // ignore options argument, options should not change during the lifetime of the plugin
     return this.defaultLibFilePath;
   }
diff --git a/tools/broccoli/broccoli-writer.d.ts b/tools/broccoli/broccoli-writer.d.ts
index 059d8a557d..5d821fa4f9 100644
--- a/tools/broccoli/broccoli-writer.d.ts
+++ b/tools/broccoli/broccoli-writer.d.ts
@@ -2,7 +2,7 @@
 
 declare module "broccoli-writer" {
   class Writer {
-    write(readTree:(tree) => Promise<string>, destDir:string):Promise<any>;
+    write(readTree: (tree) => Promise<string>, destDir: string): Promise<any>;
   }
   export = Writer;
 }
diff --git a/tools/broccoli/ts2dart.d.ts b/tools/broccoli/ts2dart.d.ts
index 8f7bc2a462..9c7c856798 100644
--- a/tools/broccoli/ts2dart.d.ts
+++ b/tools/broccoli/ts2dart.d.ts
@@ -11,8 +11,8 @@ declare module "ts2dart" {
   }
 
   export class Transpiler {
-    constructor(options:TranspilerOptions);
+    constructor(options: TranspilerOptions);
 
-    transpile(fileNames:string[], outdir?:string);
+    transpile(fileNames: string[], outdir?: string);
   }
 }