ifdef statement for tauspinner
Merge remote-tracking branch 'upstream/master'
merged ians master for new production
new production feb 18 + new class for qcd estimation
Merge remote-tracking branch 'bastian/master'
adjust ntuple controller to new ntuple
Merge pull request #16 from anehrkor/master

updates for Production_2014_Feb_18