Updates for upcoming changes in pypy stdlib paths
Merge pull request #408 from bdkearns/develop

Fix for change in pypy 2.0 stdlib path