Merge pull request #55 from ffrensch/master

adding the possibility to plot an injected signal = expected s+b
first round of cleanup of macros -- potentially the legend still has to be moved a bit to the right and mm might drop the WJets template
Merge pull request #56 from roger-wolf/master

first round of cleanup of macros -- potentially the legend still has to ...
newest configs for mssm mm
Merge remote-tracking branch 'upstream/master'