Fix Niaoning typo

Also replace the old shapefile plotting codes.
Improve China masking

Add NAME attribute in China boundary shapefile.