Merge branch 'ed/color-prompt'