Mended typos & missing dependencies
Maintain order of picks
Better logging during a KeyMap error
Merge pull request #26 from FenrirUnbound/patch/broken-mail

Patch/broken mail