Bunch of changes for arch
Merge branch 'master' of https://github.com/banrahan/emacs.d

Conflicts:
	elisp/004_general.el
	elisp/300_languages.el
	init.el