Add a helper to detect the architecture.
Install pypy for proper architechture.
Merge branch 'pypy-arch'.