Get rid of the merging information inserted by git into aklogparser3.py.

also: some changes to please pylint.

Plan to fork a feature/polish/shorten branch to work on arranging for
a shorter the 'additional info' part in the output.