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

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

@@ -4,6 +4,6 @@
         "backbone": ["underscore"]
     },
     "dependencyMap": {
-        "underscore": "underscore@1.5.2"
+        "underscore": "npm:underscore@1.5.2"
     }
 }

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

@@ -1,9 +1,13 @@
 {
-    "main": "lib/backbone.marionette.min",
+    "main": "backbone.marionette.min",
-    "dependencyShim": {
+    "directories": {
-        "lib/backbone.marionette.min": ["backbone"]
+        "lib": "lib"
     },
     "dependencyMap": {
-        "backbone": "backbone@1.1.0"
+        "backbone": "github:backbone@1.1.0",
+        "underscore": "npm:underscore@1.5.2"
+    },
+    "dependencyShim": {
+        "backbone.marionette.min": ["backbone", "underscore"]
     }
 }

registry.json

@@ -1,4 +1,12 @@
 {
+  "!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",
+  
   "angular": "cdnjs:angular.js/{version}#angular",
   "angular-ui": "cdnjs:angular-ui/{version}#angular-ui",
   "angularFire": "github:firebase/angularFire",