Added emacs-testify

Conflicts:

	init.el