simplify and speed up color handling, closes #1828
Merge branch 'master' of github.com:wayneeseguin/rvm