johnsojc's patch for avatar headshots

Derived from
http://forum.guildofwriters.org/viewtopic.php?f=114&p=63757#p63757 with a
few minor changes (use constant aspect ratio and change the male CY).