mark commands with color
cli: Fix plumbum switch help text padding
Merge branch 'various_small'