Wrap keywords in CDATA if so requested.

Some keywords contain XML characters like ampersands, breaking
the document.
Merge pull request #1 from rjkip/bugfix/keywords-cdata

Wrap keywords in CDATA if so requested.