Jim's edit of old stuff.
Merge branch 'master' of https://github.com/jladdjr/test