commiting changes to use RooMultiPdf -> discrete nuisances
don't use loop for miniimation if no discrete nuisances
Merge branch 'nckw_discrete-nuisance-parameters_24_07_2013' of github.com:nucleosynthesis/HiggsAnalysis-CombinedLimit

Conflicts:
	python/DatacardParser.py