Add more name mappings.
Merge pull request #27 from timplunkett/master

et al is a popular contributor