Merge pull request #1570 from RosettaCommons/everyday847/phosphohis Parameters for phosphorylated histidine