Refine and improve the zh-CN collation to more closely implement the full rules, as documented here:

http://pinyin.info/news/2012/pinyin-sort-order/