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

package-overrides/github/ajkochanowicz/Kickstrap@1.3.2.json

@@ -0,0 +1,9 @@
+{
+    "main": "Kickstrap/js/kickstrap",
+    "dependencyShim": {
+        "Kickstrap/js/kickstrap": ["jquery"]
+    },
+    "dependencyMap": {
+        "jquery": "jquery@1.10"
+    }
+}

package-overrides/github/ajkochanowicz/tinygrowl.json

@@ -0,0 +1,5 @@
+{
+    "dependencyShim": {
+        "tinygrowl": ["bootstrap@3.0.0"]
+    }
+}

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

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

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

@@ -0,0 +1,9 @@
+{
+    "main": "lib/backbone.marionette.min",
+    "dependencyShim": {
+        "lib/backbone.marionette.min": ["backbone"]
+    },
+    "dependencyMap": {
+        "backbone": "backbone@1.1.0"
+    }
+}

registry.json

@@ -4,7 +4,11 @@
   "angularFire": "github:firebase/angularFire",
   "backbone": "github:jashkenas/backbone",
   "bootstrap": "github:twbs/bootstrap",
+  "chosen.jquery": "cdnjs:chosen/{version}#chosen.jquery",
   "jquery": "github:components/jquery",
+  "kickstrap": "github:ajkochanowicz/Kickstrap",
+  "marionette": "github:marionettejs/backbone.marionette",
+  "tinygrowl": "github:ajkochanowicz/tinygrowl",
   "underscore": "npm:underscore",
   "webfont": "cdnjs:webfont/1.3.0#webfont"
 }