Remove unnecessary new line
Fix mailmap file

Include my new email address.
Change email address on website

My new one is 'inbox@'.