removing 2to3 magic
remove distribute
fix import problem
another import issue
removing support for pypy - can't figure out the problem