Merge pull request #1800 from RosettaCommons/bazzoli/pwsho-nonprotein Adds pwSHO modeling of non-protein atom types