More logging and debugging work
Merge branch 'master' of https://github.com/joereynolds1/genpy