turn on listchars, disable cursorcolumn
Merge remote-tracking branch 'origin/master'