Merge remote-tracking branch 'origin/catamount'
Added Excited-state equilibration files for bchl
Merge branches 'hopper' and 'master'
Merge branch 'master' into hopper