Fix character encoding properly!

At the last moment, I introduced a bug that made it just strip
out all the accented characters. Whoops.
Merge branch 'master' of github.com:kiln/iied