improve -h and --help

Fixup alignment of options, add note about settle being deprecated
for the option in .watchmanconfig