python support
Fix vimrc merge
Merge branch 'master' of github.com:halkeye/vim