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

package-overrides/github/firebase/angularFire@0.3.1.json

@@ -1,5 +1,5 @@
 {
-  "dependencyShim": {
-    "angularFire": ["angular@1.1.5"]
+  "shim": {
+    "angularFire": ["angular@1.1.5/angular"]
   }
 }

package-overrides/github/jashkenas/backbone@1.1.0.json

@@ -1,6 +1,6 @@
 {
     "main": "backbone",
-    "dependencyShim": {
+    "shim": {
         "backbone": ["underscore"]
     },
     "dependencyMap": {

package-overrides/github/marionettejs/backbone.marionette@1.2.2.json

@@ -3,11 +3,7 @@
     "directories": {
         "lib": "lib"
     },
-    "dependencyMap": {
-        "backbone": "github:backbone@1.1.0",
-        "underscore": "npm:underscore@1.5.2"
-    },
-    "dependencyShim": {
-        "backbone.marionette.min": ["backbone", "underscore"]
+    "shim": {
+        "backbone.marionette.min": ["backbone@1.1.0", "underscore@1.5.2"]
     }
 }

package-overrides/github/twbs/bootstrap@3.0.0.json

@@ -1,6 +1,6 @@
 {
   "main": "dist/js/bootstrap",
-  "dependencyShim": {
+  "shim": {
     "dist/js/bootstrap": ["jquery", "../css/bootstrap.css!"]
   },
   "dependencyMap": {

registry.json

@@ -1,11 +1,9 @@
 {
-  "!css": "github:jspm/plugins/css",
-  "!font": "github:jspm/plugins/font",
-  "!hbs": "github:jspm/plugins/hbs",
-  "!html": "github:jspm/plugins/html",
-  "!image": "github:jspm/plugins/image",
-  "!json": "github:jspm/plugins/json",
-  "!text": "github:jspm/plugins/text",
+  "css": "github:jspm/plugin-css",
+  "font": "github:jspm/plugin-font",
+  "image": "github:jspm/plugin-image",
+  "json": "github:jspm/plugin-json",
+  "text": "github:jspm/plugin-text",
   
   "angular": "cdnjs:angular.js",
   "angular-ui": "cdnjs:angular-ui/angular-ui",