java.nio.charset.StandardCharsets used where appropriate.
Merge branch 'master' of https://github.com/unix-junkie/cvs2unicode
Typo fixed.