Bundle psycopg2

And other tooling improvements.