Merge remote-tracking branch 'remotes/megshark/master'

Conflicts:
	Makefile.dryice.js
	demo/kitchen-sink/demo.js

demo/kitchen-sink/demo.js

@@ -120,7 +120,8 @@ var modes = [
     new Mode("textile", "Textile", ["textile"]),
     new Mode("xml", "XML", ["xml"]),
     new Mode("sh", "SH", ["sh"]),
-    new Mode("xquery", "XQuery", ["xq"])
+    new Mode("xquery", "XQuery", ["xq"]),
+    new Mode("yaml", "YAML", require("ace/mode/yaml").Mode, ["yaml"])
 ];
 
 modesByName = {};
@@ -167,6 +168,10 @@ var docs = [
         "xml", "XML",
         require("ace/requirejs/text!./docs/xml.xml")
     ),
+    new Doc(
+        "yaml", "YAML",
+        require("ace/requirejs/text!./docs/yaml.yaml")
+    ),
     new Doc(
         "svg", "SVG",
         require("ace/requirejs/text!./docs/svg.svg")

demo/kitchen-sink/docs/yaml.yaml

@@ -0,0 +1,35 @@
+# This sample document was taken from wikipedia:
+# http://en.wikipedia.org/wiki/YAML#Sample_document
+---
+receipt:     Oz-Ware Purchase Invoice
+date:        2007-08-06
+customer:
+    given:   Dorothy
+    family:  Gale
+
+items:
+    - part_no:   'A4786'
+      descrip:   Water Bucket (Filled)
+      price:     1.47
+      quantity:  4
+
+    - part_no:   'E1628'
+      descrip:   High Heeled "Ruby" Slippers
+      size:      8
+      price:     100.27
+      quantity:  1
+
+bill-to:  &id001
+    street: |
+            123 Tornado Alley
+            Suite 16
+    city:   East Centerville
+    state:  KS
+
+ship-to:  *id001
+
+specialDelivery:  >
+    Follow the Yellow Brick
+    Road to the Emerald City.
+    Pay no attention to the
+    man behind the curtain.