Merge pull request #601 from RosettaCommons/dougrenfrew/fix_ncaa_fixbb
This updates the two-component reference energy energy methods, params files, unit tests, integration tests, and score function finger print tests. Changes to the ncaa_fixbb itest are expected (it should stop complaining) and changes to the mm_std_fa_elec_dslf_fa13_split_unfolded score test are expected as well as a result of the modified params.