Properly set colorcolumn color
Merge branch 'master' into linny