Only load ssh-find-agent if it's available
Merge branch 'master' of https://github.com/jkinred/dotfiles

Conflicts:
	.bashrc