Update key mapping for GLFW3

I reorganised my own branches. This is the same patch as submitted previously, but sent individually and rebased on your latest commit.