some fixes to be able to run on clusters again
Merge branch 'trunk' of http://github.com/larlight/LArLight into trunk