merge from ajaxorg/master

package.json

@@ -1,7 +1,7 @@
 {
     "name": "ace",
     "description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
-    "version": "0.1",
+    "version": "0.1.6",
     "homepage" : "http://github.com/ajaxorg/ace",
     "engines": {"node": ">= 0.2.0"},
     "author": "Fabian Jakobs <fabian@ajax.org>",
@@ -10,6 +10,27 @@
         "type" : "git",
          "url" : "http://github.com/ajaxorg/ace.git"
     },
+    "overlay": {
+        "teleport": {
+            "directories": {
+                "lib": "lib/ace",
+                "dependencies": {
+                    "cockpit": ">=0.1.1",
+                    "pilot": ">=0.1.1"
+                }
+            }
+        }
+    },
+    "dependencies": {
+        "pilot": ">=0.1.1",
+        "cockpit": ">=0.1.1",
+        "teleport": ">=0.2.6",
+        "asyncjs": ">=0.0.2",
+        "jsdom": ">=0.1.23",
+        "htmlparser": ">=1.7.2",
+        "dryice": ">=0.2.2",
+        "mime": ">=1.2.1"
+    },
     "licenses": [{
         "type": "MPL",
         "url": "http://www.mozilla.org/MPL/"
@@ -20,7 +41,7 @@
     },
     {
         "type": "LGPL",
-        "url": "http://www.gnu.org/licenses/lgpl.html"
+        "url": "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html"
     }],
     "directories": {
         "lib": "lib/ace"