Revised variables and file names to be consistent throughout project.  This should be declared the running master.
Merge remote-tracking branch 'CAHgeneratorRepo/master'