Tauola lifetime patch 7 2 x v2

Revert back to tau lifetime back to using Tauola++ and not doing it by hand. Please ignore white space or this comparison(?w=1).