Merge pull request #2712 from RosettaCommons/everyday847/kalli_master_merge
Updates to RNA-protein modeling in FARFAR: modeling with density, high-res refinement of RNPs, RNP low-res score function updates, and an optional new method for setting up fold trees.
All integration test changes are expected due to new RNA-protein score terms, new residue types (noncanonical RNA residues), and a new energy function tag (exclude_RNA_RNA_fa_elec).