diff --git a/package.json b/package.json
index 2cbd5e141e9..dfb9af5f12a 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,6 @@
     "rjs-build-analysis": "0.0.3",
     "rxjs": "5.0.0-beta.0",
     "systemjs": "0.19.6",
-    "tslint": "^2.5.0-beta",
     "zone.js": "0.5.10"
   },
   "engines": {
@@ -76,6 +75,7 @@
     "lodash": "^2.4.1",
     "sinon": "1.16.1",
     "systemjs-builder": "^0.14.15",
+    "tslint": "^3.2.0",
     "typescript": "^1.7.5"
   }
 }
diff --git a/public/app/grafana_app.ts b/public/app/grafana_app.ts
index 36745efa10c..ed49fdc7535 100644
--- a/public/app/grafana_app.ts
+++ b/public/app/grafana_app.ts
@@ -17,7 +17,7 @@ import bootstrap = require('bootstrap');
 import kbn = require('app/core/utils/kbn');
 import config = require('app/core/config');
 
-// import {Component} from 'vendor/npm/angular2/core';
+//  import {Component} from 'angular2/core';
 // console.log(Component);
 
 export class GrafanaApp {
diff --git a/public/views/index.html b/public/views/index.html
index bc9ba358622..978f2adb2c7 100644
--- a/public/views/index.html
+++ b/public/views/index.html
@@ -69,6 +69,7 @@
 
 	<script>
 		System.import('app/app').then(function(app) {
+			console.log(app)
 			app.init();
 		}).catch(function(err) {
 			console.log('Loading app module failed: ', err);
diff --git a/tasks/systemjs_task.js b/tasks/systemjs_task.js
index f35e99bbee9..8bcb59e3e61 100644
--- a/tasks/systemjs_task.js
+++ b/tasks/systemjs_task.js
@@ -12,7 +12,7 @@ module.exports = function(grunt) {
     console.log('Starting systemjs-builder');
 
     builder
-      .bundle('app/app', 'public_gen/app/app.js')
+      .bundle('app/app + app/features/all', 'public_gen/app/app.js')
       .then(function() {
         console.log('Build complete');
         done();