easier move for dvorak
Merge branch 'master' into mbp15
fix duplicate settings
Merge branch 'master' into mbp15