added .mailmap
updated .gitmap