Backport 2i/1.4 updates from the docs redesign (jrd-2i-1.4)

1.4 2i changes, plus some general cleanup on the 2i config cookbook.