Hans Ulrich Niedermann <gp@n-dimensional.de>

And re-design the complete command line syntax into something
consistent, powerful and easy to understand, using one command line
parser instead of two.
