Finished on the import of siteinfo.xml, as well as bug fixes in the
parsing.  This commit also includes test siteinfo.xml data.