Added command-line parsing, added support for --[no-]merge, --[no-]push,
--tag, --keyfile, and --config.