Changed Amber Atom comparison to use mass, name and then index.
Previously just used index.