Font reorg
Merge branch 'master' of https://github.com/rfru/settings

Conflicts:
	config/emacs/config/my-theme.el