Merge branch 'jn/parse-config-slot' into jk/colors

* jn/parse-config-slot:
  color_parse: do not mention variable name in error message
  pass config slots as pointers instead of offsets

diff --cc builtin/clean.c
Simple merge

diff --cc builtin/config.c
Simple merge