Modified AtomDistributor and AtomCollector objects to be members of the
AtomStorage class instead of the configIo class.
Moved the AtomDistributor and AtomCollector objects to be members
of the AtomStorage classes instead of the ConfigIO classes.  Accidentally
committed to master instead of sp branch.  Fixing that with this commit.
Merge branch 'master' into sp