args is better for python 3 compatibility
there too
Using @wraps here confuses py.test on python3, I think because it's passing through the argument specification which py.test is using to look for fixtures. We don't want it to do that as we're providing those arguments ourselves. Just preserve the name and docstring
Merge branch 'travis' of https://github.com/rboulton/hypothesis
run 2to3 before running tests under python3
Merge branch 'master' of https://github.com/DRMacIver/hypothesis