Change to tokenizing format and add support for wrapping with HTML if 'h' is added to formatspec
Add a load of tests for html format and fix the one bug they found