Updated vimrc
Refactored vim plugins