allow discrete nuisances to also be frozen with --freezeNuisances
Merge pull request #88 from bendavid/freezeDiscrete

allow discrete nuisances to also be frozen with --freezeNuisances
cleanup of couts

Conflicts:
	interface/RooSplineND.h
	src/RooSplineND.cc
Adding RooSplineND entry to LinkDef
Merge pull request #89 from nucleosynthesis/nckw-roosplinend

cleanup of couts
Merging developments from the master branch