add spirit config
added Opensource directory to common/src, more dot files
update to working branch of pelican-themes
Merge branch 'master' into personal
remove extra echo statement
Merge branch 'personal' of github.com:jhamman/portable-environment into personal
setup spirit links
generalize gitignore path
Merge branch 'personal' of github.com:jhamman/portable-environment into personal
add hydra config
add thermal config
add Panoply to conf-local/common dir, includes overlays
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
move panoply to unknown-linux platform only
Merge branch 'personal' of github.com:jhamman/portable-environment into personal
add bartsimac
add macos panoply, kerberos paths
Merge branch 'personal' of github.com:jhamman/portable-environment into personal
add garnet config