Merge pull request #511 from RosettaCommons/wpotrzebowski/fiber_diffraction_defs Wpotrzebowski/fiber diffraction defs