Merge "main: Slight refactor of main. Improve color situation."
authorMatt Jordan <mjordan@digium.com>
Thu, 26 Nov 2015 04:17:47 +0000 (22:17 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 26 Nov 2015 04:17:47 +0000 (22:17 -0600)

Trivial merge