Start over with Vim's 7.4 python.vim + existing highlights + some of python-mode's highlight