Change escaping to HTML instead of CDATA

Should address issue #1