Merge pull request #2379 from RosettaCommons/everyday847/GAI_mods Some modifications to be able to model guanidinium ions during stepwise