new colors for vim, and gitconfig changes (master)