Improved "Conor mode" emacs colours
Merge branch 'better-emacs-colors'