Switched from Vundle to vim-plug + enhancements