Managing plugins with vundle
Updated vimrc
Merge to resolve conflicts