Merge branch 'master' of github.com:jspm/registry

package-overrides/github/angular/bower-angular-mocks@1.2.7.json

@@ -0,0 +1,11 @@
+{
+  "main": "angular-mocks",
+  "shim": {
+    "angular-mocks": {
+      "deps": ["angular"]
+    }
+  },
+  "dependencies": {
+  	"angular": "^1.2.20"
+  }
+}

package-overrides/github/angular/bower-angular@1.2.22.json

@@ -0,0 +1,8 @@
+{
+  "main": "angular.min",
+  "shim": {
+    "angular.min": {
+      "exports": "angular"
+    }
+  }
+}

package-overrides/npm/mocha@1.21.4

@@ -0,0 +1,15 @@
+{
+  "browser": "mocha",
+  "shim": {
+    "mocha": {
+      "deps": ["./mocha.css!"],
+      "exports": "mocha"
+    }
+  },
+  "jspm": {
+    "dependencies": {
+      "css": "*"
+    },
+    "registry": "jspm"
+  }
+}

registry.json

@@ -5,8 +5,9 @@
   "text": "github:systemjs/plugin-text",
   "font": "github:guybedford/system-font",
   "md": "github:guybedford/system-md",
-  
+
   "angular": "github:angular/bower-angular",
+  "angular-mocks": "github:angular/bower-angular-mocks",
   "angularFire": "github:firebase/angularFire",
   "backbone": "npm:backbone",
   "backbone.babysitter": "github:marionettejs/backbone.babysitter",
@@ -25,6 +26,7 @@
   "font-awesome": "npm:font-awesome",
   "foundation": "github:zurb/bower-foundation",
   "hammer": "github:hammerjs/hammer.js",
+  "handlebars": "github:components/handlebars.js",
   "handlebars.js": "github:components/handlebars.js",
   "intro": "github:usablica/intro.js",
   "jiff": "github:cujojs/jiff",