Fix 'html' not being seen as a valid file extension. Simplify that code more.
Merge branch 'master' of https://github.com/sullo/nikto