Difftool work, SSH config update

Signed-off-by: Evan Senter <evansenter@gmail.com>