Merge pull request #63 from peastman/master

Fixed a bug in CustomIntegrator related to atom reordering