magit-simple-keys.el: fix typo in commentary
magit-classic-theme.el: add library header
Merge branch 'cleanup'
Merge branch 'master' into next