Add forgotten fields to merge_ifconf.
Make merge_ifconf use explicit defaults.
Add support for default parameters to config parser.
Add global options to configuration parser.

This also adds options protocol-port and protocol-group.
Add more options to the config file.