Really fixed install commands.  Added missing import in setup.py.