using f8 for smerge-previous, to be consistent with flymake-next-error
removing python-mode TODOs following upgrade of python.el