macros and so on to save
Merge branch 'save_local'

Conflicts:
	.emacs

Resolved; just kept everything. Some cruft in there, but whatevs.