Merge pull request #5217 from RosettaCommons/alamo/deer_rewrites_feb2021 Bug fixes for some files in core/scoring/epr_deer