Merge branch 'master' of github.com:elim/dotemacs

Conflicts:
	config/builtins.el