Enabling rerere

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

Conflicts:
	.emacs.d/abbrev_defs