Merge branch 'JSON-Support'

Conflicts:
	lib/bundle.js

lib/bundle.js

@@ -79,15 +79,18 @@ function bundle (input, complete) {
       var buffer = [loader.toString()];
 
 
-       var dbuffer = [];
+      var dbuffer = [];
 
 
       for (var i = deps.length; i--;) {
         var dep = deps[i];
 
-
-        var req = "function (require, module, exports, __dirname) { \n" + dep.source + "}"
-
+        var req = "function (require, module, exports, __dirname) { \n" 
+        if (dep.id.toLowerCase().indexOf(".json", dep.id.length - 5) !== -1) {
+          //this is the result of require("someFile.json"), so we need to export it from the function
+          req += "module.exports = "
+        }
+        req += dep.source + "}";
 
         dbuffer.push(JSON.stringify(dep.id) + ": ["+req+", "+!!dep.entry+", "+JSON.stringify(dep.deps)+"]")
       }