Modifications to sanitization of fields.
Merge pull request #6 from madebymany/features/escaping-changes

Modifications to sanitization of fields.