.vimrc and .vim updated to include plugins