arch updates
Merge branch 'master' of github.com:jasalt/konffit

Conflicts:
	emacs/emacs-packages.el
	emacsrc.el