minor change
tab to spaces
some pylint stuff
winmerge.py (launcher)