Merge remote-tracking branch 'origin/larsoft-build' into develop

Conflicts:
	config/defaults.cfg
	config/fnal-pkgs.cfg
Merge branch 'larsoft-build' into develop
fix to build nutools dictionary libraries
Merge branch 'larsoft-build' into develop
export dictionaries too