Merge branch 'master' into hopper
Merge branch 'master' into hopper
Added bchl functionality, and updated hopper to its current state
Merge branch 'master' of github.com:jhaberstroh/gromacs-scripts into hopper
Updated cluster_equilibrate for catamount
Committing hopper changes
Merge branch 'master' of github.com:jhaberstroh/gromacs-scripts into hopper
So much confusion, this is a bad commit
Merged stupidly
Updated bchl runtime files to allow for fmo-z and bchl-z
oops, missed one
Updated cluster_equilibrate.sh
Merge remote-tracking branch 'origin/catamount'