cleanup vimrc, wean off a couple more shortcuts