Merge pull request cms-hh-pd#44 from cms-hh-pd/moriond17_dev

align master to moriond17dev to use new ntuples

Merge pull request cms-hh-pd#39 from cms-hh-pd/btag_syst

Add btag sf systematic variations, fix eta range (sf=1 if eta>2.4)