commiting changes to use RooMultiPdf -> discrete nuisances
support also <name>=<factory statement> in the mappings (but you have to use ';' instead of ':' in the factory statement since the ':' is already used by the mapping)
don't use loop for miniimation if no discrete nuisances
make sure the factories are executed after the definition of the variables, in the order specified
put back in the new changes
- added code to annotate the exception thrown when encountering
  a bad line from the datacards file with the line number and
  file name if known
  (most of the diff shown is actually a necessary increase in
   indendation of the code)
Update README.md

Added recipe to merge conflicting pull requests.
also allow to map to 0 or 1
print also prefit
better split
Merge branch 'master' of github.com:gpetruc/HiggsAnalysis-CombinedLimit

Conflicts:
	python/DatacardParser.py