Merge pull request #78 from DealerDotCom/feature/colors

Adding in more tests about colors. From DealerDotCom's feature/colors branch.
Merge remote-tracking branch 'upstream/master' into feature/colors