Take basic vars from user, if given
Merge pull request #9 from jdanbrown/patch-1

Take basic vars from user, if given
Respect .mailmap, if provided.

The log command to retrieve the user name should use the "%aN" format placeholder instead of "%an", which does not respect .mailmap. If a .mailmap file has been created, it should be used. In the absence of a .mailmap file it will work the same as "%an".
Merge pull request #10 from jwollese/master

Respect .mailmap, if provided.