Separates `overall` variables into SHHS1 and SHHS2 versions, fixes #40

`overall_shhs1` and `overall_shhs2` variables now exist.