doctest/units (again)

This fixes the doctests in the units .rst docs that were broken during the recent reorganization or rebase.