Fixing overenthusiastic XML escaping, and some indents
Merge pull request #55 from lawrenceakka/encoding_fixes

Fixing overenthusiastic XML escaping, and some indents