Prep for Python 3.1!
12 files changed