Vim colorcolumn is now set in upstream