Merge pull request #11 from cvubrugier/master

Fix exception raised when 'help' is invoked
Don't use elif when previous conditional returns

To follow-on Christophe's previous fix, now that the previous conditional
returns, it's a little easier to follow (IMHO) if the next conditional
is an 'if' instead of an 'elif'.

Also, add an empty line.

Signed-off-by: Andy Grover <agrover@redhat.com>