Revise mapping for t-key in normal mode
Merge branch 'master' into mac