Squash multiple commits for colorful output

contains:

http://review.cyanogenmod.org/#/c/24785
http://review.cyanogenmod.org/#/c/75464
http://review.cyanogenmod.org/#/c/75399

*All credits goes to the original authors for these commits