Bump pypy to top to start earlier in travis runs
Cleanup for python3 errors
Finish off python3 compat