Cleanup and improve output of --help

Change-Id: I1bfe519e858cfcb698522c8e8890c16c52669d81
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>