Don't fall back to colorcolumn hack (breaks on older vims)
Merge branch 'master' of https://github.com/sjn/dotfiles