A few fixes and enhancements

Fixed a few things that I noticed immediately when running against https://neg9.org/ - I have XSS in the Server: header value, which popped up in the report for this tool.

Future: Cleanup unicode handling (replacing u'blah' with blah and such?)