Merge pull request #1470 from RosettaCommons/hahnbeom/fa_intra_elec this is "just adding fa_intra_elec term".