Update xmonad.hs
Merge remote-tracking branch 'upstream/master'