Merge pull request #298 from hynek/master

Allow pypy to fail for now