Spec sync-up: hz-gb-2312 is replacement; simplify shift_jis
Merge branch 'master' of https://github.com/inexorabletash/text-encoding