integrating diff code into the data objects more seamlessly; some minor comment editing in the collocation module

git-svn-id: https://svn.ssec.wisc.edu/repos/glance/trunk@113 8a9318a1-56ba-4d59-b755-99d26321be01