Merge pull request #126 from adamwdraper/develop

Develop 1.5.3
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
Commit minified version