Update vimrc for latest Vundler

Everything is "Plugin" now, not "Bundle", etc.
Update some aliases for new laptop