my-todo
updated todo with configuration info
todo updates
todo updates
all the stuff
Merge remote-tracking branch 'refs/remotes/origin/craycray'

Conflicts:
	.gitignore
	.mc-lists.el
	init.el
	jorbi/jorbi-dev.el
	jorbi/jorbi-fns.el
	jorbi/jorbi-scratch.el
removed file