Getting local changes before I pull/push to remote.
Merge branch 'master' of github.com:perlygatekeeper/my_unix_customizations

Conflicts:
	.tcshrc
ok, almost ready for push.  Should no longer track .ssh/know_hosts nor
.vim/.netrwhist