[PATCH] Code Cleanup

A patch which cleans the code up some and makes it more namespace clean. Also
fixes a few niggling little bugs with XHTML namespaces and Content-Types (not
to mention the "file://" regression test ;D).