Updated vimrc and plugins
Resolved conflicts