Update my e-mail address on author lines.

Left CBR some years ago, so use replaced the CBR e-mail address with the
one that I've been using after that in all commits.  This one will
hopefully stay the same in the foreseeable future...

Change-Id: I479426c4b7b323d6613e5f91588880c624e78cf1