hpc changes
Merge branch 'master' of github.com:nbren12/dotfiles