Improvements to the CLI
Merge pull request #767 from RobertBColton/master

Improvements to the CLI
Command Line Interface Improvements
test
Cleanup and fix some minor bugs.
Fix scripts.
Merge pull request #768 from RobertBColton/master

Command Line Interface Improvements