Optionally overwrite Makefile vars in config.mk
Show argument for short options if available

The argument was only show for the long option. To be complete and to
avoid confusion, show argument for short option as well.
Add --password and --stdout flags for dispass gen