Cleaned up remaining Python2 issues.  We have a running server.  Possibly introduced an XML parsing bug #167.