Merge pull request #1094 from RosettaCommons/roccomoretti/reenable_atoms
Re-enable the atom types we commented out in the XRW due to unit test issues.
Andrew has fixed the bug associated with them, so there is no reason to keep them commented out.
Trajectory changes for integration tests, due to the added number of atom types.