Updated Emacs abbrevs.
Add a snippet to add a TODO comment in Java code (Yasnippet@Emacs).
Merge branch 'master' of github.com:laurentpsychedelic/settings

Conflicts:
	.emacs.d/abbrev_defs