made some more fixes to the docstring/parameter mismatches

Also, updated script that displays mismatches.  Had to make a change
to six.py, as winreg isn't on linux and that was throwing an error.