Add marmalade version 0.0.4.
Add xmodmap to the setup step.
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into awesome-3.4.2