Add sourcing ?vimrclocal, and some other tweaks