Fix locales and headers
Merge branch 'master' of https://github.com/rodgermd/slk