Misc change to vimrc to make it work better