Better handling of utf-8
Fixes #13
Merge branch 'master' into pathogen-bundle