new host
Merge branch 'master' of vcs.missouri.edu:philred/dotfiles

Conflicts:
	known_hosts