Add auto-toggle of cursorline and cursorcolumn
Merge branch 'master' into mac