Bump version to 6.1.16
Bump version to 6.1.16-dev
Vendor in py.test; #558

Now that we support running the test with py.test, let's vendor it in as
well. Maybe in the future we'll use it for `make test` / `./gittip.py
test` and we can retire nosetest from vendor/.