Added cleaned up text to rich text output

The rich text fields are now serialized to a structure
rather than a single string, the structure contains both
the raw html and a textified 'clean' version.