Incorporating capillarity into models for P-wave attenuation and dispersion in partially saturated rocks