Store missing keymap for unregistering, and small style cleanup
Merge pull request #2 from dfelinto/master

Store missing keymap for unregistering, and small style cleanup