Removed ctrlp, added nerdtreetabs, multiple-cursors, jedi-vim
resolving conflicts