Merge pull request #195 from csmith/master

Minor tidying.
Moved StyledDocument et al into swing.