1-Updated Emacs abbrevs.
Merge branch 'master' of github.com:laurentpsychedelic/settings

Conflicts:
	.emacs.d/abbrev_defs