Fix prompt end

Regression from fef5a4701fcece77895ca9ba29129ab73a8f8207.
Source local settings last

Should be able to override common settings.
Use vim, not vi