reference wisc by ip
Merge branch 'master' of github.com:cunha/dotfiles

Conflicts:
	.ssh/config