Added jedi-vim
Resolved merge conflicts