Better HTML detection.  Too many false positives before.  Closes #55