fix import confusion, use pypy
remove svn files