Adam/i18n bug fixes

@jtauber 
@singingwolfboy 
It fixes some templates, adjusts some tests, and removes "zh_CN" from the config file.

Does this look about right?