Yet more fontsturbation.
Merge branch 'master' of github.com:candera/emacs

Conflicts:
        colors.el