Major cleanup of color stuff to get solarized colors working in emacs properly.