Add pypy builder and python3 handling