Fixed word-wise moving keymaps
Merge pull request #839 from bromagosa/master

Fixed word-wise moving keymaps