Merge pull request #1322 from RosettaCommons/roccomoretti/ddg_nonprot
An old pull request which attempted to fix issues with non-protein residues in ddg_monomer and associated. Some of these were fixed in a separate pull request (#1465) from Amelie. These are residual fixes/tweaks that aren't superflous from those.