push print changes to ship
push print changes to ship
clean up special-case use of org

There was a bunch of special-case code in there because the VA-specific
database did not use the org column.  I went ahead and added it there so
that the code can be simpler.  Also changed group ids to be
org-specific.