Fix import issue

This is the definitive fix to the import problem.  Note change to setup.py.
Merge pull request #35 from eigenhombre/fix-imports-again

Fix import issue