fill in common bashrc
Merge branch 'personal' of github.com:jhamman/portable-environment into personal

Conflicts:
	setup/old_dot_files/emacs
	setup/old_dot_files/emacs.d
	setup/old_dot_files/gitconfig
	setup/old_dot_files/gitignore_global
	setup/old_dot_files/ncviewrc
	setup/old_dot_files/vimrc
Merge branch 'personal' of github.com:jhamman/portable-environment into personal
add macos panoply, kerberos paths
Merge branch 'personal' of github.com:jhamman/portable-environment into personal