Changes to work with next branch. Also removed unnecessary imports.
Update to GR3.7 API. Rebuilt package from gr_modtool to clean up bitrot and
cruft.