More minor edits.
Merge branch 'master' of https://github.com/avigad/isabelle
Made minor edits without having pulled recently enough.