change font to fira
add minor modes
Merge branch 'master' of github.com:ljos/.emacs.d

Conflicts:
	configuration.org