new vimrc, cleaned old cruft