commiting changes to use RooMultiPdf -> discrete nuisances
updated HZZ4LRooPdfs.cc with new RooaDoubleCBxBW
updated HZZ4LRooPdfs.h with new RooaDoubleCBxBW
Merge pull request #9 from msnowball/master

Updated HZZ4LRooPdfs.h/cc
Normalised lib name usage for cross-platform compatibility
Constructor directly from file
Merge pull request #10 from adavidzh/master

Constructor directly from file
Pre and post fit shapes and uncertainties
support for new naming scheme
Merge pull request #11 from roger-wolf/master

making script executable
fix indices and names
Revert "support for new naming scheme" to have the branch based on
what's in the production repository

This reverts commit 00f7eeeda799e26b0a5c8eb70b3eb60f55f56ab8.
Revert "Pre and post fit shapes and uncertainties" to go back
to the central master branch

This reverts commit 2caf3b06d028ea85aeb3d4d97eb5933c652d846c.
Merge pull request #13 from gpetruc/fix-doubleRatio-model

Fix double ratio model
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