Upgrade ergoemacs, reorganize 'init-keys'