use original settings for Dvorak
Merge branch 'master' into mbp15