Updated .vimrc plugins for newer Vundle. Updated the s/ syntax auto remapping.