express interest with accurate timeout based on interest Lifetime

My editor seems to have cleaned a bunch of whitespace, so this commit looks far larger than it actually is.

changes are on lines #316 and #362

316: in face.expressInterest, call face.expressInterestWithClosure with interest as the template argument to correctly apply timeout

362: use || operator to define default interestLifetime when template is undefined