Okfnmerge

For comments.

Note `pdftables` version has been reverted to keep consistent with OKFN.