Add Long Options

Add long options and their respective help menu options.   Clean up the
help / usage menu.