Pollute less of the PATH (__moi__ private prefix for utilities)
Merge master.  Also fix git/vim editor config.