Fix Dvorak settings
Apply Dvorak settings
Merge branch 'master' into mbp15