Got rid of submodules slime to re-add from a different repo.
Re-added slime submodule.
Added submodule calfw. Cherry-picked from origin/work.
Partly merged origin/work's init.el.
Merge branch 'master' into work

Conflicts:
	.gitmodules
	init.el