Update vimrc to work with latest Vundle. Tweak aliases.