CLI overhaul.
Minor 'gs done' tweaks.
Merge pull request #21 from buren/cli_clean_up

CLI overhaul.