Various changes copied from Joe's vimrc.