Non-ASCII cleanup

This bring in changes via https://github.com/github/training-kit/pull/110 and makes just one other tune-up. Thanks @gwood for getting this started and submitting the fixes.