Convert LH to evap (kg) AFTER doing SH correction

Right now I'm converting latent heat flux to water units *before* doing the "did you try to evaporate more water than you have" check (which puts excess latent heat flux into sensible heat flux). It should happen after, otherwise the `evap` variable (in water units) won't match the `lhflx` variable (in energy units) if some of lhflx gets transferred to shflx. Quick fix, but if I try to do it right now when I'm tired I'll break something. I then use `evap` to subtract water from the bucket, which wouldn't have the adjustment for sensible heat flux included - maybe this is causing some of the soil moisture followed by nan problems. Maybe not. Regardless, it seems wrong, so should be fixed!