Have to adjust the font size of the font-lock-function-name.
Merge branch 'master' into solarized-dark

Conflicts:
	config.el