Merge pull request #546 from RosettaCommons/vmullig/triazolemer_tweaks Tweaking database patches for triazolemer class residues. Should result in no test changes.