Now --help and --version are always included in help output (#46)