some updates
rearrange key order to be more sensible
fix some thigns
You can also use your local clone with git send-email.