Merge pull request #448 from hynek/master

Use PyPy 5.0.0