nutools building
Merge branch 'larsoft-build' of github.com:LBNE/lbne-build into larsoft-build

Conflicts:
	config/defaults.cfg
	patches/lbne/nutools-1.06.04.patch
	patches/lbne/nutools-1.07.00.patch