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
- 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)
Merge pull request #16 from andreh7/ah-2013-07-25

Looking through [this version of the diff](https://github.com/andreh7/HiggsAnalysis-CombinedLimit/commit/53fa568a1887acfb41cd858992c02996d9903761?w=1) (which ignores whitespace, as blatantly taken from [here](https://github.com/blog/967-github-secrets)) this looks like a nice addition. Thanks!
Merge branch 'nckw_discrete-nuisance-parameters_24_07_2013' of github.com:nucleosynthesis/HiggsAnalysis-CombinedLimit

Conflicts:
	python/DatacardParser.py
Update README.md

Added recipe to merge conflicting pull requests.
Merge pull request #14 from gpetruc/MultiSignalModel-extras

support also <name>=<factory statement> in the mappings
also allow to map to 0 or 1
better split
Merge pull request #17 from gpetruc/MultiSignalModel-extras-part2

Multi signal model extras part2
Pre and post fit shapes and uncertainties
support for new naming scheme
print also prefit
print prefit only if -u
Merge pull request #18 from gpetruc/postfit-rebased

Pre and post-fit uncertainties
If the rate is below 1e-3, use scientific notation
Fix weight issue
Merge pull request #19 from gpetruc/fix-non-uniform-binned-generation

Fix weight issue