Merge remote-tracking branch 'upstream/master' into colors
Fix accidental scheme.h inclusion
Use unicode code points for colors vs escapes

Unicode characters beggining at the U+E000 private area are now used for
color specifiers instead of ASCII escape sequences.

Also, a bug causing wide unicode characters to screw up formatting when
used in combination with color specifiers is fixed.
Merge branch 'colors'