Merge pull request #91 from roger-wolf/master

a few fixes for Felix (mostly knock on of missing templates for WJets in...
and cleaned up for Felix...