Merge with HTML_Codesniffer

Brings this fork up to date with the latest changes to upstream and fix a few problems that I found.