Restore the module import lines in __init__.py
Restore the module import lines in __init__.py

These hit the import ordering just right to avoid issues and need to
stay there until I fix the circular dependencies.

marineam/nagcat,marineam/nagcat,marineam/nagcat