adaptions to latest changes for vhtt
added vhtt to channels for combination
fixed a typo in the vhtt configuration
reimplemented the new bbb configuration
included vhtt into the horizontal morphing option, also updated the modification for hww as signal as category 2 was dropped
Merge branch 'master' of https://github.com/rcaspart/HiggsAnalysis-HiggsToTauTau into rcaspart

Conflicts:
	setup/vhtt/unc-sm-7TeV-01.vals