Merge pull request #5456 from RosettaCommons/dimaio/masked_spharm_matcher Dimaio/masked spharm matcher