Update vimrc with some Damien Conway tweaks