Merge remote-tracking branch 'origin/catamount'
Merge remote-tracking branch 'origin/catamount' into hopper
Added Excited-state equilibration files for bchl
Merge branches 'hopper' and 'master'
Merge branch 'catamount'
Rudimentary AvTrajHist.py working
Merge branch 'master' of github.com:jhaberstroh/gromacs-scripts into catamount