Update dircolors.
bundle update
Merge branch 'master' into os_x

* master:
  bundle update
  Update dircolors.