Merge pull request #765 from RobertBColton/master

Command Line Interface
Merge pull request #767 from RobertBColton/master

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

Command Line Interface Improvements
Cleanup texture code.