Checked in Gary Bernhardt's githelpers
Fixed problems with original vim still getting used in $EDITOR