added jedi-vim
Merge vim changes