Use original atom IDs instead of YAP_Atom values to represent atoms.
Merge branch 'develop'