Allow combineCards.py to pick up discrete nuisance parameters
Also add runtime warning if there is a name clash
Merge pull request #56 from matthewkenzie/get_combineCard_to_pick_up_discrete_nuis

Allow combineCards.py to pick up discrete nuisance parameters