Merge remote branch 'jviereck/keymapping'

Conflicts:
	.gitignore
	.gitmodules
	LICENSE
	demo/boot.js
	demo/startup.js
	lib/ace/editor.js
	support/cockpit

Author: fjakobs

.gitignore

@@ -11,4 +11,5 @@
 .*.gz
 
 # A handy place to put stuff that git should ignore:
-/ignore/
+/ignore/
+/build/

.gitmodules

@@ -21,7 +21,10 @@
 	url = git://github.com/tautologistics/node-htmlparser.git
 [submodule "support/cockpit"]
 	path = support/cockpit
-	url = git://github.com/ajaxorg/cockpit.git
+	url = git://github.com/mozilla/cockpit.git
 [submodule "support/pilot"]
 	path = support/pilot
 	url = git://github.com/ajaxorg/pilot.git
+[submodule "support/dryice"]
+	path = support/dryice
+	url = git://github.com/mozilla/dryice.git