xmonad updated
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xmonad/xmonad.hs