Merge configuration options.

Signed-off-by: Austin Seipp <aseipp@pobox.com>