Merge remote-tracking branch 'upstream/sourcemint' into 00

Conflicts:
	package.json

package.json

@@ -24,6 +24,9 @@
     "engines": {
       "node": "~0.6.0"
     },
+    "mappings": {
+        "ace": "."
+    },
     "licenses": [{
         "type": "MPL",
         "url": "http://www.mozilla.org/MPL/"
@@ -39,5 +42,28 @@
     },
     "scripts": {
         "test": "node lib/ace/test/all.js"
+    },
+    "config": {
+        "github.com/sourcemint/bundler-js/0/-meta/config/0": {
+            "adapter": "github.com/sourcemint/sdk-requirejs/0",
+            "modules": {
+                "/lib/ace/virtual_renderer.js": {
+                    "dynamicLinks": [
+                        "/lib/ace/theme/*.js"
+                    ]
+                },
+                "/lib/ace/worker/worker_client.js": {
+                    "dynamicLinks": [
+                        "/lib/ace/worker/worker_sourcemint.js"
+                    ]
+                },
+                "/lib/ace/worker/worker_sourcemint.js": {
+                    "bundleLoader": true,
+                    "dynamicLinks": [
+                        "/lib/ace/mode/*_worker.js"
+                    ]
+    }
+            }
+        }
     }
 }