thingies
Merge branch 'master' of github.com:pxlpnk/emacs.d

Conflicts:
	etc/built-in.el
	etc/org-mode.el