Add some colors.
Merge branch 'master' of git://github.com/tharna/conf into tharna
tharna's mega colors