Added Default logic per #2484, and also added the local option back in, because it exists in the code and should be shown as helptext, at least.

License: MIT
Signed-off-by: Richard Littauer <richard.littauer@gmail.com>