ssh updates
Merge branch 'master' of github.com:drd/dotfiles

Conflicts:
	dotfiles/ssh/known_hosts