Clean up xmonad config
Merge branch 'master' into zaalbar

Conflicts:
	xmonad/lib/Keys.hs
Fix spacing
Merge branch 'master' into zaalbar