changes to prelim merger to make sure it works.
Merge branch 'trunk' of github.com:larlight/larlite into trunk