Adding in two building envelop calibration measures. Adding AddBuildingType measure. Adding in measure for server cleaning. Adding in updates to analysis