Fix proto import bug

In addition to doing `import mod` we also do the previous
`from mod import *`. The former keeps the package support that was
recently added, and the latter fixes the regression that broke plain
proto imports.
Whitespace changes