minor changes for keyboard shortcuts
Merge branch 'key-master' into km-stage
fix some of the help descs
Merge branch 'key-master' into km-stage