remove xmodmap mess
Merge branch 'master' into desktop