Don't use colorcolumn if we don't have nice colors
Update gitconfig
Merge branch 'master' of https://github.com/joshkel/dotfiles