Ensuring we don't accidentally use a site_info file from a directory when someone specifies a site name.
Switching name and name.global for the ultimate source of information.
Removing deprecated code that was added elsewhere.
Commenting out broken code for now.