colorcolumn is now only set if vim version supports it; prevents startup error messages
Merge branch 'master' of https://github.com/emd/dotfiles