document vimrc file for python
fix merge