Fixing tabs vs. space problem.
Dumb typo when setting up clojure-mode-hook.
More abbrevs
More things to do with multiple-cursors
Experimenting with new font.
Enabling rerere

Conflicts:
	.gitconfig
Fixing typo in init-misc.
Fixing machine update script.
More Abbrevs.

Conflicts:
	.emacs.d/abbrev_defs