spell fix
Merge branch 'master' of github.com:torandi/dotfiles

Conflicts:
	ssh_config