Tweaks for python 3.  Don't test under 3.3 for now, since it doesn't work.