Tweaking capture templates.

Conflicts:
	.emacs.d/init-org.el