Merge pull request #2298 from RosettaCommons/everyday847/more_farfar_unification A couple minor improvements for FARFAR CSA