Merge from default mhoward-lt

Update, got omz files in right place

scrolloff to 4

(0) -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 tip

mercurial