More refactoring - now using WikiHTMLField class

This makes it easier to extend into a SimpleWikiHTMLField (for events,
comments, etc)