Add automatic logging to screen.
Fixup some formatting in vimrc file.
Change git push.default to 'simple' to replace obsolete 'tracking'
Add diffmerge as merge open, prioritize above opendiff