simple fixes to run merging python scripts
Merge branch 'trunk' of github.com:larlight/LArLight into trunk