处理ibus冲突
Merge branch 'master' of github.com:svtter/MyVimrc

处理冲突
add python_template