Shorter description for --username and --client-id flags

This also drops one whitespace from every line of options
summary in README.md so it won't be longer than 40 chars
in order to fit right on GitHub.