Update python implementation of atom pairs to reflect #334. This code probably should be deprecated at some point