vim: Do not override {Cursor,}LineNr
Merge remote-tracking branch 'origin/master' into mac