More abbrevs.

Conflicts:
	.emacs.d/abbrev_defs
Improving ediff for my full-screen usage.