Okfnmerge

Note: this also reverts the version of pdftables in setup.py for consistency with okfn.
I guess this file should be named `test_shim26.py`