Merge branch 'master' into no-elements

Conflicts:

	basis/html/templates/templates.factor

diff --cc basis/furnace/chloe-tags/chloe-tags.factor
Simple merge

diff --cc basis/html/templates/chloe/chloe.factor
index 99afbc31bda34406aff8a313320e5c70087cb380,6ab6722afe65f675c10b0924f9214cf028b79e49..89d00e1f6ea1e684336f60a823becff19063325e
--- 1/basis/html/templates/chloe/chloe.factor
--- 2/basis/html/templates/chloe/chloe.factor
+++ b/basis/html/templates/chloe/chloe.factor
@@@ -5,9 -5,10 +5,9 @@@ namespaces make classes.tuple assocs sp
  io.files io.files.info io.encodings.utf8 io.streams.string
  unicode.case mirrors math urls present multiline quotations xml
  logging continuations
- xml.data xml.writer xml.literals strings
+ xml.data xml.writer xml.syntax strings
  html.forms
  html
 -html.elements
  html.components
  html.templates
  html.templates.chloe.compiler

diff --cc basis/html/templates/templates.factor
index c0fec8d1b634c9495dd282e31da34111b5f099f4,4aca73cc577a652931798df77ff7817aeb205f2b..4a416e353fbf58baaa66c7418e84367e6a1a922f
--- 1/basis/html/templates/templates.factor
--- 2/basis/html/templates/templates.factor
+++ b/basis/html/templates/templates.factor
@@@ -2,8 -2,8 +2,8 @@@
  ! See http://factorcode.org/license.txt for BSD license.
  USING: accessors kernel fry io io.encodings.utf8 io.files
  debugger prettyprint continuations namespaces boxes sequences
 -arrays strings html io.streams.string
 +arrays strings html io.streams.string assocs
- quotations xml.data xml.writer xml.literals ;
+ quotations xml.data xml.writer xml.syntax ;
  IN: html.templates
  
  MIXIN: template