Fix how species richness is calculated to ensure that the Gentry dataset does not cause problems. Improve how site ids are matched.