adding few plugins
vimrc support for plugins
resolve merge conflict