Okfnmerge

Note: this also reverts the version of pdftables in setup.py for consistency with okfn.