check if colorcolumn setting exists before using it (it isn't on older vim versions)
Merge branch 'master' of https://github.com/tonyblundell/.vim