Cosmetic changes and comments
Merge branch 'dev' of https://github.com/agnwinds/python into dev

Apparently I am behind.  My changes are all cosmetic -- comments and
formatting changes