Merge python.vim and python3.0.vim into python.vim

Merge Python 3 and Python 3 script versions into
the single python.vim script