Improve `--help` and `--complete` argument handling
Get rid of now needless for loops
Alter how internal help invocation work to make life a bit easier
Remove forgotten and useless variable
Bump version to 0.6.1
Merge branch 'master' into new-init-system