Add xmodmap to the setup step.
Merge remote-tracking branch 'origin/master'