Merge pull request #1954 from RosettaCommons/Cyrus/mergetarget
From Steven Lewis:
three items:
1) @yfsong -sourced bugfixes and updates to Hybridize. This is mostly an update to add a more powerful constructor (previously the class was dependent on parse_my_tag being called). This code is marked as smlewis code because it's a squash-cherrypick from an abandoned poisoned branch.
2) read_topology_file, the function that converts params files into ResidueTypes, previously assumed that the file was coming in from disk (string filename, or izstream from file). The interface has been rearranged to allow a std::istream, for params files not coming from disk (coming in over network communication from some non-Rosetta black box in my case). There has been discussion of unifying the function name read_topology_file and the file names "*.params" to match better - that's been put off to the winter meeting.
3) @roccomoretti pointed out a bug in my last ACTCCMover updates; fixed.
Tests all look fine from my end. There is an added unit test to support read_topology_file.