Add font configuration
Merge branch 'work' of github.com:kenhys/emacs.d into work

Conflicts:
	config/local.el