diff --git a/.gitignore b/.gitignore
index 1a371685b..e8b3ef640 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,18 @@
-.idea
-typings/**
-node_modules
-jspm_packages
-link-checker-results.txt
-**/*npm-debug.log.*
-*.js
-*.js.map
-_test-output
-_temp
-
-!**/*e2e-spec.js
-!karma*.js
-!protractor*.js
-!systemjs.config.js
-!typings/typings.d.ts
-!wallaby.js
+.idea
+typings/**
+node_modules
+jspm_packages
+link-checker-results.txt
+**/*npm-debug.log.*
+*.js
+*.js.map
+_test-output
+_temp
+*.sublime-workspace
+*.sublime-project
+!**/*e2e-spec.js
+!karma*.js
+!protractor*.js
+!systemjs.config.js
+!typings/typings.d.ts
+!wallaby.js
diff --git a/index.html b/index.html
index be896a385..038f968f3 100644
--- a/index.html
+++ b/index.html
@@ -7,14 +7,15 @@
 
     <!-- Polyfill(s) for older browsers -->
     <script src="node_modules/es6-shim/es6-shim.min.js"></script>
-
     <script src="node_modules/zone.js/dist/zone.js"></script>
     <script src="node_modules/reflect-metadata/Reflect.js"></script>
     <script src="node_modules/systemjs/dist/system.src.js"></script>
 
+    <script src="node_modules/rxjs/bundles/Rx.js"></script>
+
     <script src="systemjs.config.js"></script>
     <script>
-      System.import('app').catch(function(err){ console.error(err);  });
+      System.import('app').catch(console.error);
     </script>
   </head>
 
diff --git a/systemjs.config.js b/systemjs.config.js
index 5a45d3fc0..4b887bd38 100644
--- a/systemjs.config.js
+++ b/systemjs.config.js
@@ -8,7 +8,7 @@
   // map tells the System loader where to look for things
   var map = {
     'app':                        'app', // 'dist',
-    'rxjs':                       'node_modules/rxjs',
+    // 'rxjs':                       'node_modules/rxjs',
     'angular2-in-memory-web-api': 'node_modules/angular2-in-memory-web-api',
     '@angular':                   'node_modules/@angular'
   };
@@ -16,7 +16,7 @@
   // packages tells the System loader how to load when no filename and/or no extension
   var packages = {
     'app':                        { main: 'main.js',  defaultExtension: 'js' },
-    'rxjs':                       { defaultExtension: 'js' },
+    // 'rxjs':                       { defaultExtension: 'js' },
     'angular2-in-memory-web-api': { defaultExtension: 'js' },
   };
 
@@ -34,7 +34,8 @@
 
   // add package entries for angular packages in the form '@angular/common': { main: 'index.js', defaultExtension: 'js' }
   packageNames.forEach(function(pkgName) {
-    packages[pkgName] = { main: 'index.js', defaultExtension: 'js' };
+    var main = pkgName.slice(pkgName.lastIndexOf('/') + 1) + '.umd.js';
+    packages[pkgName] = { main: main, format: 'amd', defaultExtension: 'js' };
   });
 
   var config = {
diff --git a/tsconfig.json b/tsconfig.json
index 302417ff3..6ee6719cb 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "es5",
-    "module": "commonjs",
+    "module": "system",
     "moduleResolution": "node",
     "sourceMap": true,
     "emitDecoratorMetadata": true,