add other directories to testing
Add style url rewriting back

Avoid use of .html() and .text() as they can treat comment strings as HTML