Mailmap Support and Other Changes#32

jsomers merged 11 commits intojsomers:masterjsomers/git-game:masterfrom

coffee-dan:mastercoffee-dan/git-game:masterCopy head branch name to clipboard